Fix bug in state_diagnose to accept 4d variables. Update CCPP Framewo…

…rk to support IAP model. Update weekly tests (#1349) * Fix bug in state_diagnose to accept 4d variables * Update CCPP Framework to support IAP model * Update weekly tests
ufs-community · Aug 4, 2022 · c5aa49f · c5aa49f
1 parent 9ae617e
commit c5aa49f
Show file tree

Hide file tree

Showing 16 changed files with 6,532 additions and 6,778 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_acorn.intel.log b/tests/RegressionTests_acorn.intel.log
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_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -145,13 +145,15 @@ elif [[ $MACHINE_ID = jet.* ]]; then
   OCN_tasks_cpl_bmrk=100
   ICE_tasks_cpl_bmrk=48
   WAV_tasks_cpl_bmrk=100
+  WLCLK_cpl_bmrk=120
 
   # run only in weekly test
   TASKS_cpl_c192=1404; THRD_cpl_c192=2
   INPES_cpl_c192=12; JNPES_cpl_c192=16; WPG_cpl_c192=24
   OCN_tasks_cpl_c192=100
   ICE_tasks_cpl_c192=48
   WAV_tasks_cpl_c192=80
+  WLCLK_cpl_c192=120
 
 elif [[ $MACHINE_ID = s4.* ]]; then
 

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -175,5 +175,5 @@ fi
 
 #prognostic aerosols
 if [ $CPLCHM = .true. ]; then
-  ln -sf  @[INPUTDATA_ROOT]/GOCART/p8/ExtData .
+  ln -sf  @[INPUTDATA_ROOT]/GOCART/p8c_5d/ExtData .
 fi
diff --git a/tests/rt_weekly.conf b/tests/rt_weekly.conf
@@ -1,13 +1,13 @@
 ###################################################################################################################################################################################
-# Weekly tests                                                                                                                                                                      #
+# Weekly tests                                                                                                                                                                    #
 ###################################################################################################################################################################################
 
 COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_nsstNoahmpUGWPv1 -D32BIT=ON                                     | + hera.intel                | fv3 |
 RUN     | control_c768                                                                                                    | + hera.intel                | fv3 |
 
 # CPLD Benchmark 35d tests
 # The length of forecast is 5 days for the weekly tests.
-COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                 | + hera.intel                | fv3 |  |
+COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                                 | + hera.intel                | fv3 |  |
 RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2012010100
 RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2012040100
 RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2012070100
@@ -17,7 +17,6 @@ RUN     | cpld_bmark_p8_35d
 RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2013070100
 RUN     | cpld_bmark_p8_35d                                                                                               | + hera.intel                | fv3 |  | 2013100100
 # The coupled p8 tests
-COMPILE | -DAPP=S2SW -DUFS_GOCART=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                 | + jet.intel                 | fv3 |
+COMPILE | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8                                                 | + jet.intel                 | fv3 |
 RUN     | cpld_bmark_p8                                                                                                   | + jet.intel                 | fv3 |
 RUN     | cpld_control_c192_p8                                                                                            | + jet.intel                 | fv3 |
-RUN     | cpld_control_c384_p8                                                                                            | + jet.intel                 | fv3 |
diff --git a/tests/tests/cpld_bmark_p8 b/tests/tests/cpld_bmark_p8
@@ -75,6 +75,7 @@ export INPES=$INPES_cpl_bmrk
 export JNPES=$JNPES_cpl_bmrk
 export THRD=$THRD_cpl_bmrk
 export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
+export WLCLK=${WLCLK_cpl_bmrk:-$WLCLK}
 
 OCN_tasks=$OCN_tasks_cpl_bmrk
 ICE_tasks=$ICE_tasks_cpl_bmrk

diff --git a/tests/tests/cpld_bmark_p8_35d b/tests/tests/cpld_bmark_p8_35d
@@ -1,7 +1,7 @@
 #
-#  cpld_bmark_p8 35 day test
+#  cpld_bmark_p8 5-day test
 #
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark P7 35 day test"
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C384L127 OCN/ICE/0.25-degree WAVE/30m - Benchmark P8 test"
 
 export CNTL_DIR="cpld_bmark_p8"
 
@@ -19,18 +19,25 @@ export BMIC=.true.
 
 export DAYS=5
 export FHMAX=120
-export RESTART_N=`expr ${FHMAX} - ${FHROT}`
-export WLCLK=120
+export RESTART_N=$FHMAX
+export RESTART_INTERVAL="${RESTART_N} -1"
+export OUTPUT_FH="6 -1"
+export FHZERO=6
+export WLCLK=240
 
-export TASKS=1700
-export INPES=12
-export JNPES=16
-export THRD=2
-export WRTTASK_PER_GROUP=88
+export DOMAINS_STACK_SIZE=16000000
 
-OCN_tasks=220
-ICE_tasks=80
-WAV_tasks=160
+export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
+
+export TASKS=$TASKS_cpl_bmrk
+export INPES=$INPES_cpl_bmrk
+export JNPES=$JNPES_cpl_bmrk
+export THRD=$THRD_cpl_bmrk
+export WRTTASK_PER_GROUP=$WPG_cpl_bmrk
+
+OCN_tasks=$OCN_tasks_cpl_bmrk
+ICE_tasks=$ICE_tasks_cpl_bmrk
+WAV_tasks=$WAV_tasks_cpl_bmrk
 
 # atm/ocn/ice resolution
 export ATMRES=C384
@@ -45,7 +52,7 @@ export OCNRES=025
 export ICERES=0.25
 export NX_GLB=1440
 export NY_GLB=1080
-export NPROC_ICE=80
+export NPROC_ICE=$ICE_tasks
 export np2=`expr $NPROC_ICE / 2`
 export BLCKX=`expr $NX_GLB / $np2`
 export BLCKY=`expr $NY_GLB / 2`
@@ -60,7 +67,6 @@ export DT_DYNAM_MOM6=900
 export DT_THERM_MOM6=1800
 
 # nems.configure
-export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
 export coupling_interval_slow_sec=${DT_THERM_MOM6}
 export coupling_interval_fast_sec=${DT_ATMOS}
 
@@ -71,6 +77,8 @@ 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'"
@@ -83,23 +91,13 @@ export FNVMXC="'C384.vegetation_greenness.tileX.nc'"
 export FNSLPC="'C384.slope_type.tileX.nc'"
 export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
 
-export CDMBWD=${CDMBWD_c384}
+#BMICs do not contain NSST spinup
+export NSTF_NAME=2,1,0,0,0
 
-export MOM6_RIVER_RUNOFF=True
-export MOM6_RESTART_SETTING=r
+export CDMBWD=${CDMBWD_c384}
 
-export WW3GRIDLINE="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'  1  1  0.00 1.00  F"
-export WW3RSTDTHR=${FHMAX}
-export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
-export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
-export RUN_END="2100${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR}  )))0000"
 export OUT_BEG=$RUN_BEG
-export OUT_END=$RUN_END
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
-export RST_END=$RUN_END
-export RST_2_END=$RUN_END
-
-export DIAG_TABLE=diag_table_template
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -73,6 +73,7 @@ export INPES=$INPES_cpl_c192
 export JNPES=$JNPES_cpl_c192
 export THRD=$THRD_cpl_c192
 export WRTTASK_PER_GROUP=$WPG_cpl_c192
+export WLCLK=${WLCLK_cpl_c192:-$WLCLK}
 
 OCN_tasks=$OCN_tasks_cpl_c192
 ICE_tasks=$ICE_tasks_cpl_c192