Merge pull request #37 from olyson/zerothtstep

Stop running 0th timestep
ESCOMP · Nov 12, 2024 · a2cd824 · a2cd824
2 parents 1d10716 + 6dcdfbc
commit a2cd824
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/riverroute/RtmHistFile.F90 b/src/riverroute/RtmHistFile.F90
@@ -1039,9 +1039,6 @@ subroutine RtmHistHtapesWrapup( rstwr, nlend )
     ! and write data to history files if end of history interval.
     do t = 1, ntapes
 
-       ! Skip nstep=0 if monthly average
-       if (nstep==0 .and. tape(t)%nhtfrq==0) cycle
-
        ! Determine if end of history interval
        tape(t)%is_endhist = .false.
        if (tape(t)%nhtfrq==0) then   !monthly average

diff --git a/src/riverroute/RtmTimeManager.F90 b/src/riverroute/RtmTimeManager.F90
@@ -992,7 +992,7 @@ end function is_end_curr_month
 
 logical function is_first_step()
 
-  ! Return true on first step of initial run only.
+  ! Return true on first step of startup and hybrid runs.
    character(len=*), parameter :: sub = 'rtm::is_first_step'
    integer :: rc
    integer :: nstep
@@ -1001,7 +1001,7 @@ logical function is_first_step()
    call ESMF_ClockGet( tm_clock, advanceCount=step_no, rc=rc )
    call chkrc(rc, sub//': error return from ESMF_ClockGet')
    nstep = step_no
-   is_first_step = (nstep == 0)
+   is_first_step = (nstep == 1)
 
 end function is_first_step