Merge pull request #102 from NCAR/ocn_lag

Fix ocn lag logic for continue_runs
NOAA-GFDL · May 15, 2019 · e0a8b9b · e0a8b9b
2 parents 8797615 + b2ff365
commit e0a8b9b
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/config_src/nuopc_driver/mom_cap.F90 b/config_src/nuopc_driver/mom_cap.F90
@@ -1847,8 +1847,11 @@ subroutine ModelAdvance(gcomp, rc)
     file=__FILE__)) &
     return  ! bail out
 
+  Time_step_coupled = esmf2fms_time(timeStep)
+  Time = esmf2fms_time(currTime)
+
   !---------------
-  ! Apply ocean lag at startup:
+  ! Apply ocean lag for startup runs:
   !---------------
 
   if (cesm_coupled) then
@@ -1881,15 +1884,8 @@ subroutine ModelAdvance(gcomp, rc)
           file=__FILE__)) &
           return  ! bail out
         Time_step_coupled = 2 * esmf2fms_time(timeStep)
-      else
-        Time_step_coupled = esmf2fms_time(timeStep)
-        Time = esmf2fms_time(currTime)
       endif
     endif
-
-  else ! non-cesm runs:
-    Time_step_coupled = esmf2fms_time(timeStep)
-    Time = esmf2fms_time(currTime)
   endif