Update FV3 submodule. Adjust main clock in UFS for restart runs.

ufs-community · DusanJovic-NOAA · Dec 27, 2021 · Dec 17, 2021 · Dec 20, 2021 · Dec 21, 2021
commit e47ccc8591c6acf23806d66607f5ea2a210edce3
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,9 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  # url = https://github.com/NOAA-EMC/fv3atm
+  # branch = develop
+  url = https://github.com/DusanJovic-NOAA/fv3atm
+  branch = use_ModelSetRunClock
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

diff --git a/FV3 b/FV3
diff --git a/driver/UFS.F90 b/driver/UFS.F90
@@ -371,7 +371,9 @@ PROGRAM UFS
         CALL ESMF_TimeIntervalSet(restartOffset, h=fhrot, rc=RC)
         ESMF_ERR_ABORT(RC)
         CURRTIME = STARTTIME + restartOffset
-        call ESMF_ClockSet(CLOCK_MAIN, currTime=CURRTIME, rc=RC)
+        call ESMF_ClockSet(CLOCK_MAIN, currTime=CURRTIME, &
+                                       timeStep=(TIMESTEP-restartOffset), &
+                                       rc=RC)
         ESMF_ERR_ABORT(RC)
       endif
 ! ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~

diff --git a/tests/parm/model_configure_regional.IN b/tests/parm/model_configure_regional.IN
@@ -6,6 +6,7 @@ start_hour:              00
 start_minute:            0
 start_second:            0
 nhours_fcst:             @[FHMAX]
+fhrot:                   @[FHROT]
 
 dt_atmos:                225
 cpl:                     .false.

diff --git a/tests/tests/control_wam b/tests/tests/control_wam
@@ -42,3 +42,4 @@ export H2O_PHYS=.true.
 export NFHOUT=6
 export NFHMAX=24
 export NFHOUT_HF=6
+export FHROT=18
diff --git a/tests/tests/regional_restart b/tests/tests/regional_restart
@@ -41,3 +41,5 @@ export TASKS=68
 export INPES=10
 export JNPES=6
 export OUTPUT_FH="15 18 21 24"
+
+export FHROT=12
+96 −281		fv3_cap.F90
+75 −28		module_fcst_grid_comp.F90
+1 −3		module_fv3_config.F90