Initial restart test. More edits

NickSzapiro-NOAA · Aug 22, 2024 · 3eb100f · 3eb100f
1 parent 27301c7
commit 3eb100f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 6 deletions.
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -121,15 +121,20 @@ else
      fi
 
      #if not mx025, then mom6 restart is a single file
-     if [[ $OCNRES == 025 ]]; then
+     #if [[ $OCNRES == 025 ]]; then
+     if [[ ${MOM6_PARALLEL_RESTARTFILES} ]]; then
       cp ../${DEP_RUN}${SUFFIX}/${MOM6_RESTART_DIR}/${RESTART_FILE_PREFIX}.MOM.res.nc ./INPUT/MOM.res.nc
       cp ../${DEP_RUN}${SUFFIX}/${MOM6_RESTART_DIR}/${RESTART_FILE_PREFIX}.MOM.res_1.nc ./INPUT/MOM.res_1.nc
       cp ../${DEP_RUN}${SUFFIX}/${MOM6_RESTART_DIR}/${RESTART_FILE_PREFIX}.MOM.res_2.nc ./INPUT/MOM.res_2.nc
       cp ../${DEP_RUN}${SUFFIX}/${MOM6_RESTART_DIR}/${RESTART_FILE_PREFIX}.MOM.res_3.nc ./INPUT/MOM.res_3.nc
      else
       cp ../${DEP_RUN}${SUFFIX}/${MOM6_RESTART_DIR}/${RESTART_FILE_PREFIX}.MOM.res.nc ./INPUT/MOM.res.nc
       if [[ $ODA_INCUPD == 'True' ]] && [[ $FHROT -le 6 ]]; then
-        cp @[INPUTDATA_ROOT]/MOM6_IC/mom6_increment.nc ./INPUT/mom6_increment.nc
+        if [[ ${BMIC} ]]; then
+          cp ${MOM_IC}/mom6_increment.nc ./INPUT
+        else
+          cp @[INPUTDATA_ROOT]/MOM6_IC/mom6_increment.nc ./INPUT/mom6_increment.nc
+        fi
       fi
      fi
 

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -53,7 +53,7 @@ RUN | cpld_restart_c192_p8                              | - wcoss2 jet acorn s4
 
 COMPILE | s2swa | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 | | fv3 |
 RUN | cpld_bmark_gefs                                   | - s4 jet acorn noaacloud             | baseline |
-#RUN | cpld_restart_bmark_gefs                           | - s4 jet acorn noaacloud             |          | cpld_bmark_gefs
+RUN | cpld_restart_bmark_gefs                           | - s4 jet acorn noaacloud             |          | cpld_bmark_gefs
 
 # Aerosol, no Wave
 RUN | cpld_s2sa_p8                                      | - noaacloud                          | baseline |

diff --git a/tests/tests/cpld_bmark_gefs b/tests/tests/cpld_bmark_gefs
@@ -66,7 +66,7 @@ export BMIC=.true.
 
 export DAYS=0.5
 export FHMAX=12
-export RESTART_N=12
+export RESTART_N=$((FHMAX-FHROT))
 export RESTART_INTERVAL="${RESTART_N} -1"
 export OUTPUT_FH="3 -1"
 export FHZERO=3
@@ -181,8 +181,7 @@ export NUDGE_QV=.false.
 # ICE warm start
 export CICE_RUNTYPE=continue
 export CICE_USE_RESTART_TIME=.false.
-# OCN warm start but https://github.com/ufs-community/ufs-weather-model/discussions/1708
-#export MOM6_RESTART_SETTING=n
+export MOM6_RESTART_SETTING=r
 
 export FNALBC="'C384.snowfree_albedo.tileX.nc'"
 export FNALBC2="'C384.facsf.tileX.nc'"

diff --git a/tests/tests/cpld_restart_bmark_gefs b/tests/tests/cpld_restart_bmark_gefs
@@ -0,0 +1,20 @@
+#
+#  cpld_restart_bmark_gefs test
+#
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - restart test"
+
+export CNTL_DIR=cpld_bmark_gefs
+
+source ${PATHRT}/tests/${CNTL_DIR}
+
+export FHROT_REST=3 
+export FHROT=$((FHROT+FHROT_REST))
+export RESTART_N=$((FHMAX-FHROT))
+export RESTART_INTERVAL="${RESTART_N} -1"
+export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT} + ${SHOUR} )))0000"
+
+export MOM6_RESTART_SETTING=r
+
+export CICE_USE_RESTART_TIME=.true.
+export CICE_DIAGFREQ=`expr $((FHMAX-FHROT)) \* 3600 / $DT_CICE`