Skip to content

Fix incorrect 'xtime' variable in MPAS-A when dt is non-integral #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2019
Merged

Fix incorrect 'xtime' variable in MPAS-A when dt is non-integral #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/core_atmosphere/dynamics/mpas_atm_time_integration.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module atm_time_integration
contains


subroutine atm_timestep(domain, dt, timeStamp, itimestep)
subroutine atm_timestep(domain, dt, nowTime, itimestep)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
! Advance model state forward in time by the specified time step
!
Expand All @@ -76,7 +76,7 @@ subroutine atm_timestep(domain, dt, timeStamp, itimestep)

type (domain_type), intent(inout) :: domain
real (kind=RKIND), intent(in) :: dt
character(len=*), intent(in) :: timeStamp
type (MPAS_Time_type), intent(in) :: nowTime
integer, intent(in) :: itimestep


Expand All @@ -98,9 +98,8 @@ subroutine atm_timestep(domain, dt, timeStamp, itimestep)
call mpas_dmpar_global_abort('Currently, only ''SRK3'' is supported.')
end if

call mpas_set_time(currTime, dateTimeString=timeStamp)
call mpas_set_timeInterval(dtInterval, dt=dt)
currTime = currTime + dtInterval
currTime = nowTime + dtInterval
call mpas_get_time(currTime, dateTimeString=xtime_new)

block => domain % blocklist
Expand Down
6 changes: 1 addition & 5 deletions src/core_atmosphere/mpas_atm_core.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ function atm_core_init(domain, startTimeStamp) result(ierr)
real (kind=RKIND), pointer :: dt
type (block_type), pointer :: block

character(len=StrKIND) :: timeStamp
integer :: i
logical, pointer :: config_do_restart

Expand Down Expand Up @@ -846,7 +845,6 @@ subroutine atm_do_timestep(domain, dt, itimestep)

type (MPAS_Time_Type) :: startTime, currTime
type (MPAS_TimeInterval_Type) :: xtimeTime
character(len=StrKIND) :: timeStamp
integer :: s, s_n, s_d
real (kind=RKIND) :: xtime_s
integer :: ierr
Expand All @@ -858,8 +856,6 @@ subroutine atm_do_timestep(domain, dt, itimestep)
call mpas_get_timeInterval(interval=xtimeTime, S=s, S_n=s_n, S_d=s_d, ierr=ierr)
xtime_s = (s + s_n / s_d)

call mpas_get_time(curr_time=currTime, dateTimeString=timeStamp, ierr=ierr)


#ifdef DO_PHYSICS
!proceed with physics if moist_physics is set to true:
Expand All @@ -869,7 +865,7 @@ subroutine atm_do_timestep(domain, dt, itimestep)
endif
#endif

call atm_timestep(domain, dt, timeStamp, itimestep)
call atm_timestep(domain, dt, currTime, itimestep)

end subroutine atm_do_timestep

Expand Down