Use 'model set run clock' routine in FV3 NUOPC cap. (ufs-community#967)

* Update FV3 cap by adding 'model set run clock' specialization routine. Because FV3 cap does not modify 'Earth clock' anymore in case of a restarted run, that adjustment is now done in the UFS driver. * Fix model_configure file for two tests to define `fhrot` parameter.
mzhangw · Dec 27, 2021 · 3d995d7 · 3d995d7
1 parent 803e03a
commit 3d995d7
Show file tree

Hide file tree

Showing 20 changed files with 2,624 additions and 1,894 deletions.
diff --git a/FV3 b/FV3
diff --git a/doc/UsersGuide/source/InputsOutputs.rst b/doc/UsersGuide/source/InputsOutputs.rst
@@ -1146,10 +1146,6 @@ shows the following parameters that can be set in *model_configure* at run-time.
      - frequency to output restart file or forecast hours to write out restart file
      - integer
      - 0 (0: write restart file at the end of integration; 12, -1: write out restart every 12 hours; 12 24 write out restart files at fh=12 and 24)
-   * - atm_coupling_interval_sec
-     - fast coupling interval in seconds for atmosphere
-     - real(8)
-     - 900
    * - quilting
      - flag to turn on quilt
      - logical

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/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/parm/datm_cdeps_configure.IN b/tests/parm/datm_cdeps_configure.IN
@@ -9,7 +9,6 @@ nhours_fcst:             @[FHMAX]
 RUN_CONTINUE:            .false.
 ENS_SPS:                 .false.
 dt_atmos:                @[DT_ATMOS]
-atm_coupling_interval_sec:  @[coupling_interval_fast_sec]
 calendar:                'julian'
 fhrot:                   @[FHROT]
 nfhout:                  @[NFHOUT]

diff --git a/tests/parm/model_configure.IN b/tests/parm/model_configure.IN
@@ -12,7 +12,6 @@ dt_atmos:                @[DT_ATMOS]
 calendar:                'julian'
 restart_interval:        @[RESTART_INTERVAL]
 output_1st_tstep_rst:    .false.
-atm_coupling_interval_sec:      @[coupling_interval_fast_sec]
 
 quilting:                @[QUILTING]
 write_groups:            @[WRITE_GROUP]

diff --git a/tests/parm/model_configure_fhout.IN b/tests/parm/model_configure_fhout.IN
@@ -14,7 +14,6 @@ calendar:                'julian'
 restart_interval:        @[RESTART_INTERVAL]
 fhrot:                   @[FHROT]
 output_1st_tstep_rst:    .false.
-atm_coupling_interval_sec:      @[coupling_interval_fast_sec]
 
 quilting:                @[QUILTING]
 write_groups:            @[WRITE_GROUP]

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/rt_utils.sh b/tests/rt_utils.sh
@@ -330,6 +330,7 @@ check_results() {
 
   echo                                               >> ${REGRESSIONTEST_LOG}
   grep "The total amount of wall time" ${RUNDIR}/out >> ${REGRESSIONTEST_LOG}
+  grep "The maximum resident set size" ${RUNDIR}/out >> ${REGRESSIONTEST_LOG}
   echo                                               >> ${REGRESSIONTEST_LOG}
 
   TRIES=''

diff --git a/tests/run_test.sh b/tests/run_test.sh
@@ -246,8 +246,12 @@ fi
 if [[ $skip_check_results = false ]]; then
   check_results
 else
-  echo "Test ${TEST_NR} ${TEST_NAME} RUN_SUCCESS" >  ${REGRESSIONTEST_LOG}
-  echo;echo;echo                                  >> ${REGRESSIONTEST_LOG}
+  echo                                               >> ${REGRESSIONTEST_LOG}
+  grep "The total amount of wall time" ${RUNDIR}/out >> ${REGRESSIONTEST_LOG}
+  grep "The maximum resident set size" ${RUNDIR}/out >> ${REGRESSIONTEST_LOG}
+  echo                                               >> ${REGRESSIONTEST_LOG}
+  echo "Test ${TEST_NR} ${TEST_NAME} RUN_SUCCESS"    >> ${REGRESSIONTEST_LOG}
+  echo;echo;echo                                     >> ${REGRESSIONTEST_LOG}
 fi
 
 if [[ $SCHEDULER != 'none' ]]; then

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