Skip to content
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

Fixes 1379. Limited the duration of the clock #1381

Merged
merged 2 commits into from
Feb 18, 2022
Merged

Fixes 1379. Limited the duration of the clock #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0de8ca
Fixes 1379. Limited the duration of the clock
atrayano Feb 17, 2022
a26183d
Merge branch 'develop' into bugfix/atrayano/#1379_wrong_duration
mathomp4 Feb 18, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Fixed duration of the clock to be the smaller of the user specified duration and (END_DATE - currTime)
- Fixed failures to fully trap errors in
- History GC
- MemUtils
Expand Down
4 changes: 4 additions & 0 deletions gridcomps/Cap/MAPL_CapGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1678,6 +1678,7 @@ subroutine MAPL_ClockInit ( MAPLOBJ, Clock, nsteps, rc)
type(ESMF_Time) :: CurrTime ! Current Current Time of Experiment
type(ESMF_TimeInterval) :: timeStep ! HEARTBEAT
type(ESMF_TimeInterval) :: duration
type(ESMF_TimeInterval) :: maxDuration
type(ESMF_Calendar) :: cal
character(ESMF_MAXSTR) :: calendar

Expand Down Expand Up @@ -1929,6 +1930,9 @@ subroutine MAPL_ClockInit ( MAPLOBJ, Clock, nsteps, rc)
rc = STATUS )
_VERIFY(STATUS)

maxDuration = EndTime - currTime
if (duration > maxDuration) duration = maxDuration

stopTime = currTime + duration

! initialize model time step
Expand Down