revert bmark p8 changes

* need to remove bmark p8 from cheyenne.intel
DeniseWorthen · May 7, 2022 · 02d8590 · 02d8590
1 parent b8e0d72
commit 02d8590
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 41 deletions.
diff --git a/tests/parm/ice_in_template b/tests/parm/ice_in_template
@@ -23,6 +23,7 @@
     pointer_file   = './ice.restart_file'
     dumpfreq       = '@[DUMPFREQ]'
     dumpfreq_n     = @[DUMPFREQ_N]
+    dump_last      = .false.
     bfbflag        = 'off'
     diagfreq       = 6
     diag_type      = 'file'

diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
@@ -5,9 +5,9 @@ export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C3
 
 export CNTL_DIR="cpld_bmark_p8"
 
-export LIST_FILES="sfcf004.nc \
-                   atmf004.nc \
-                   gocart.inst_aod.20130401_0400z.nc4 \
+export LIST_FILES="sfcf006.nc \
+                   atmf006.nc \
+                   gocart.inst_aod.20130401_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -40,8 +40,14 @@ export LIST_FILES="sfcf004.nc \
                    RESTART/sfc_data.tile4.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
-                   20130401.040000.out_pnt.ww3 \
-                   20130401.040000.out_grd.ww3 "
+                   RESTART/MOM.res.nc \
+                   RESTART/MOM.res_1.nc \
+                   RESTART/MOM.res_2.nc \
+                   RESTART/MOM.res_3.nc \
+                   RESTART/iced.2013-04-01-21600.nc \
+                   RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc \
+                   20130401.060000.out_pnt.ww3 \
+                   20130401.060000.out_grd.ww3 "
 
 export_fv3
 export_cpl
@@ -52,14 +58,13 @@ export SDAY=01
 export SHOUR=00
 export SECS=`expr $SHOUR \* 3600`
 export BMIC=.true.
-export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
 
-export DAYS=0.166667
-export FHMAX=4
+export DAYS=0.25
+export FHMAX=6
 export RESTART_N=3
-export RESTART_INTERVAL="3 4"
-export OUTPUT_FH="1 -1"
-export FHZERO=1
+export RESTART_INTERVAL="${RESTART_N} -1"
+export OUTPUT_FH="3 -1"
+export FHZERO=3
 
 export DOMAINS_STACK_SIZE=16000000
 
@@ -112,8 +117,6 @@ export CICEGRID=grid_cice_NEMS_mx${OCNRES}.nc
 export CICEMASK=kmtu_cice_NEMS_mx${OCNRES}.nc
 export CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc
 export FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc
-export MOM6_RIVER_RUNOFF=True
-export MOM6_RESTART_SETTING=r
 
 export FNALBC="'C384.snowfree_albedo.tileX.nc'"
 export FNALBC2="'C384.facsf.tileX.nc'"
@@ -129,15 +132,12 @@ export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
 export CDMBWD=${CDMBWD_c384}
 export DT_INNER=${DT_INNER_c384}
 
-export WW3RSTDTHR=1
-export WW3OUTDTHR=1
-export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
-export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
+export MOM6_RIVER_RUNOFF=True
+export MOM6_RESTART_SETTING=r
+
+export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
 export OUT_BEG=$RUN_BEG
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
-# gocart inst_aod output; uses AERO_HIST.rc.IN from parm/gocart directory
-export AOD_FRQ=040000
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_bmark_p8 b/tests/tests/cpld_restart_bmark_p8
@@ -5,9 +5,9 @@ export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C3
 
 export CNTL_DIR="cpld_bmark_p8"
 
-export LIST_FILES="sfcf004.nc \
-                   atmf004.nc \
-                   gocart.inst_aod.20130401_0400z.nc4 \
+export LIST_FILES="sfcf006.nc \
+                   atmf006.nc \
+                   gocart.inst_aod.20130401_0600z.nc4 \
                    RESTART/coupler.res \
                    RESTART/fv_core.res.nc \
                    RESTART/fv_core.res.tile1.nc \
@@ -40,8 +40,14 @@ export LIST_FILES="sfcf004.nc \
                    RESTART/sfc_data.tile4.nc \
                    RESTART/sfc_data.tile5.nc \
                    RESTART/sfc_data.tile6.nc \
-                   20130401.040000.out_pnt.ww3 \
-                   20130401.040000.out_grd.ww3 "
+                   RESTART/MOM.res.nc \
+                   RESTART/MOM.res_1.nc \
+                   RESTART/MOM.res_2.nc \
+                   RESTART/MOM.res_3.nc \
+                   RESTART/iced.2013-04-01-21600.nc \
+                   RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc \
+                   20130401.060000.out_pnt.ww3 \
+                   20130401.060000.out_grd.ww3 "
 
 export_fv3
 export_cpl
@@ -53,19 +59,19 @@ export SHOUR=00
 export SECS=`expr $SHOUR \* 3600`
 export BMIC=.true.
 
-export DAYS=0.166667
-export FHMAX=4
+export DAYS=0.25
+export FHMAX=6
 export FHROT=3
 export RESTART_N=$((FHMAX-$FHROT))
-export OUTPUT_FH="1 -1"
-export FHZERO=1
-export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
+export OUTPUT_FH="3 -1"
+export FHZERO=3
 
 export DOMAINS_STACK_SIZE=16000000
 
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT} + ${SHOUR} )))0000"
 export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} + ${SHOUR})))"
-export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
 
 export TASKS=$TASKS_cpl_bmrk
 export TPN=$TPN_cpl_bmrk
@@ -151,15 +157,8 @@ export USE_RESTART_TIME=.true.
 export MOM6_RESTART_SETTING=r
 
 # Waves
-export WW3RSTDTHR=1
-export WW3OUTDTHR=1
-export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
-export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export OUT_BEG=$RUN_BEG
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
-# gocart inst_aod output; uses AERO_HIST.rc.IN from parm/gocart directory
-export AOD_FRQ=040000
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
@@ -65,14 +65,13 @@ export FHROT=15
 export RESTART_N=$((FHMAX-$FHROT))
 export OUTPUT_FH="15 30"
 export FHZERO=3
-export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
 
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT} + ${SHOUR} )))0000"
 export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} + ${SHOUR})))"
 export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
 
 export DOMAINS_STACK_SIZE=16000000
-
 export TASKS=$TASKS_cpl_c192
 export TPN=$TPN_cpl_c192
 export INPES=$INPES_cpl_c192

diff --git a/tests/tests/cpld_restart_p8 b/tests/tests/cpld_restart_p8
@@ -62,11 +62,11 @@ export_cpl
 
 export FHROT=12
 export RESTART_N=$((FHMAX-$FHROT))
-export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
 
 export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${FHROT} + ${SHOUR} )))0000"
 export RESTART_FILE_SUFFIX_HRS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%02d" $(( ${FHROT} + ${SHOUR})))"
 export RESTART_FILE_SUFFIX_SECS="${SYEAR}-${SMONTH}-${SDAY}-$(printf "%05d" $(( (${FHROT}+ ${SHOUR})*3600 )))"
+export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${FHROT}+${SHOUR}  )))0000"
 
 # ATM warm start
 export WARM_START=.true.