Pass dt_forcing to some step_MOM calls

  Added the new optional argument dt_forcing to the separated calls to step_MOM.
Also renamted time_step to dt_forcing in MOM_driver.F90 for greater clarity.
All answers are bitwise identical.

config_src/solo_driver/MOM_driver.F90

@@ -114,18 +114,18 @@ program MOM_main
   type(time_type) :: segment_start_time ! The start time of this run segment.
   type(time_type) :: Time_end           ! End time for the segment or experiment.
   type(time_type) :: restart_time       ! The next time to write restart files.
-  type(time_type) :: Time_step_ocean    ! A time_type version of time_step.
+  type(time_type) :: Time_step_ocean    ! A time_type version of dt_forcing.
 
   real    :: elapsed_time = 0.0   ! Elapsed time in this run in seconds.
   logical :: elapsed_time_master  ! If true, elapsed time is used to set the
                                   ! model's master clock (Time).  This is needed
                                   ! if Time_step_ocean is not an exact
-                                  ! representation of time_step.
-  real :: time_step               ! The time step of a call to step_MOM in seconds.
+                                  ! representation of dt_forcing.
+  real :: dt_forcing              ! The coupling time step in seconds.
   real :: dt                      ! The baroclinic dynamics time step, in seconds.
   real :: dt_off                  ! Offline time step in seconds
   integer :: ntstep               ! The number of baroclinic dynamics time steps
-                                  ! within time_step.
+                                  ! within dt_forcing.
   real :: dt_therm
   real :: dt_dyn, dtdia, t_elapsed_seg
   integer :: n, n_max, nts, n_last_thermo
@@ -327,19 +327,19 @@ program MOM_main
   ! Read all relevant parameters and write them to the model log.
   call log_version(param_file, mod_name, version, "")
   call get_param(param_file, mod_name, "DT", dt, fail_if_missing=.true.)
-  call get_param(param_file, mod_name, "DT_FORCING", time_step, &
+  call get_param(param_file, mod_name, "DT_FORCING", dt_forcing, &
                  "The time step for changing forcing, coupling with other \n"//&
                  "components, or potentially writing certain diagnostics. \n"//&
                  "The default value is given by DT.", units="s", default=dt)
   if (offline_tracer_mode) then
-    call get_param(param_file, mod_name, "DT_OFFLINE", time_step, &
+    call get_param(param_file, mod_name, "DT_OFFLINE", dt_forcing, &
                    "Time step for the offline time step")
-    dt = time_step
+    dt = dt_forcing
   endif
-  ntstep = MAX(1,ceiling(time_step/dt - 0.001))
+  ntstep = MAX(1,ceiling(dt_forcing/dt - 0.001))
 
-  Time_step_ocean = set_time(int(floor(time_step+0.5)))
-  elapsed_time_master = (abs(time_step - time_type_to_real(Time_step_ocean)) > 1.0e-12*time_step)
+  Time_step_ocean = set_time(int(floor(dt_forcing+0.5)))
+  elapsed_time_master = (abs(dt_forcing - time_type_to_real(Time_step_ocean)) > 1.0e-12*dt_forcing)
   if (elapsed_time_master) &
     call MOM_mesg("Using real elapsed time for the master clock.", 2)
 
@@ -464,27 +464,27 @@ program MOM_main
     endif
 
     if (use_ice_shelf) then
-      call shelf_calc_flux(sfc_state, forces, fluxes, Time, time_step, ice_shelf_CSp)
+      call shelf_calc_flux(sfc_state, forces, fluxes, Time, dt_forcing, ice_shelf_CSp)
 !###IS     call add_shelf_flux_forcing(fluxes, ice_shelf_CSp)
 !###IS  ! With a coupled ice/ocean run, use the following call.
 !###IS      call add_shelf_flux_IOB(ice_ocean_bdry_type, ice_shelf_CSp)
     endif
     fluxes%fluxes_used = .false.
-    fluxes%dt_buoy_accum = time_step
+    fluxes%dt_buoy_accum = dt_forcing
 
     if (ns==1) then
       call finish_MOM_initialization(Time, dirs, MOM_CSp, fluxes, restart_CSp)
     endif
 
-    ! This call steps the model over a time time_step.
+    ! This call steps the model over a time dt_forcing.
     Time1 = Master_Time ; Time = Master_Time
     if (offline_tracer_mode) then
-      call step_offline(forces, fluxes, sfc_state, Time1, time_step, MOM_CSp)
+      call step_offline(forces, fluxes, sfc_state, Time1, dt_forcing, MOM_CSp)
     elseif (single_step_call) then
-      call step_MOM(forces, fluxes, sfc_state, Time1, time_step, MOM_CSp)
+      call step_MOM(forces, fluxes, sfc_state, Time1, dt_forcing, MOM_CSp)
     else
-      n_max = 1 ; if (time_step > dt) n_max = ceiling(time_step/dt - 0.001)
-      dt_dyn = time_step / real(n_max)
+      n_max = 1 ; if (dt_forcing > dt) n_max = ceiling(dt_forcing/dt - 0.001)
+      dt_dyn = dt_forcing / real(n_max)
 
       nts = MAX(1,MIN(n_max,floor(dt_therm/dt_dyn + 0.001)))
       n_last_thermo = 0
@@ -496,16 +496,16 @@ program MOM_main
             dtdia = dt_dyn*min(ntstep,n_max-(n-1))
             call step_MOM(forces, fluxes, sfc_state, Time2, dtdia, MOM_CSp, &
                           do_dynamics=.false., do_thermodynamics=.true., &
-                          start_cycle=(n==1), end_cycle=.false.)
+                          start_cycle=(n==1), end_cycle=.false., cycle_length=dt_forcing)
           endif
 
           call step_MOM(forces, fluxes, sfc_state, Time2, dt_dyn, MOM_CSp, &
                         do_dynamics=.true., do_thermodynamics=.false., &
-                        start_cycle=.false., end_cycle=(n==n_max))
+                        start_cycle=.false., end_cycle=(n==n_max), cycle_length=dt_forcing)
         else
           call step_MOM(forces, fluxes, sfc_state, Time2, dt_dyn, MOM_CSp, &
                         do_dynamics=.true., do_thermodynamics=.false., &
-                        start_cycle=(n==1), end_cycle=.false.)
+                        start_cycle=(n==1), end_cycle=.false., cycle_length=dt_forcing)
 
           if ((modulo(n,nts)==0) .or. (n==n_max)) then
             dtdia = dt_dyn*(n - n_last_thermo)
@@ -514,7 +514,7 @@ program MOM_main
               Time2 = Time2 - set_time(int(floor((dtdia - dt_dyn) + 0.5)))
             call step_MOM(forces, fluxes, sfc_state, Time2, dtdia, MOM_CSp, &
                           do_dynamics=.false., do_thermodynamics=.true., &
-                          start_cycle=.false., end_cycle=(n==n_max))
+                          start_cycle=.false., end_cycle=(n==n_max), cycle_length=dt_forcing)
             n_last_thermo = n
           endif
         endif
@@ -526,7 +526,7 @@ program MOM_main
 
 !   Time = Time + Time_step_ocean
 !   This is here to enable fractional-second time steps.
-    elapsed_time = elapsed_time + time_step
+    elapsed_time = elapsed_time + dt_forcing
     if (elapsed_time > 2e9) then
       ! This is here to ensure that the conversion from a real to an integer
       ! can be accurately represented in long runs (longer than ~63 years).
@@ -548,8 +548,8 @@ program MOM_main
       call write_cputime(Time, ns+ntstep-1, nmax, write_CPU_CSp)
     endif ; endif
 
-    call enable_averaging(time_step, Time, diag)
-    call mech_forcing_diags(forces, fluxes, time_step, grid, diag, &
+    call enable_averaging(dt_forcing, Time, diag)
+    call mech_forcing_diags(forces, fluxes, dt_forcing, grid, diag, &
                             surface_forcing_CSp%handles)
     call disable_averaging(diag)