update tests

ufs-community · Jan 21, 2025 · a7eb85f · a7eb85f
1 parent d238f56
commit a7eb85f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 32 deletions.
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -98,11 +98,11 @@ if [ $WARM_START = .false. ]; then
         cp   ${MOM_IC}/mom6.mx@[OCNRES].${SYEAR}${SMONTH}${SDAY}${SHOUR}.warmstart.nc ./INPUT/mom6.warmstart.nc
         cp   ${ICE_IC}/cice.mx@[OCNRES].${SYEAR}${SMONTH}${SDAY}${SHOUR}.warmstart.nc ./cice.warmstart.nc
       else
-        cp    ${MOM_IC}/MOM6_IC_TS_${SYEAR}${SMONTH}${SDAY}${SHOUR}.nc ./INPUT/MOM6_IC_TS.nc
-        #cp    ${ICE_IC}/${OCNRES}/cice_model_@[ICERES].cpc.res_${SYEAR}${SMONTH}${SDAY}.nc ./cice_model.res.nc
-	####### FIXME #######
-	# non-valid file, just to get scripting to work; ice_in will set CICE_IC to "default" IC for now
-        cp    ${ICE_IC}/invalid.nc ./cice_model.res.nc
+        cp   ${MOM_IC}/MOM6_IC_TS_${SYEAR}${SMONTH}${SDAY}${SHOUR}.nc ./INPUT/MOM6_IC_TS.nc
+        # C12mx900 uses cice_ic = default
+        if [[ $ATMRES != C12 ]]; then
+            cp  ${ICE_IC}/${OCNRES}/cice_model_@[ICERES].cpc.res_${SYEAR}${SMONTH}${SDAY}.nc ./cice_model.res.nc
+        fi
       fi
     fi
   fi

diff --git a/tests/rt.ultra b/tests/rt.ultra
@@ -1,13 +1,15 @@
-#COMPILE | s2s | intel | -DAPP=S2S -DCCPP_SUITES=FV3_coupled_lowres -DDEBUG=ON |   | fv3 |
-COMPILE | s2s | intel | -DAPP=S2S -DCCPP_SUITES=FV3_coupled_lowres |   | fv3 |
+#COMPILE | s2s | intel | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1,FV3_coupled_lowres -DDEBUG=ON |   | fv3 |
+COMPILE | s2s | intel | -DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1,FV3_coupled_lowres |   | fv3 |
+#COMPILE | s2s | intel | -DAPP=S2S -DCCPP_SUITES=FV3_coupled_lowres |   | fv3 |
 
-#RUN | cpld_control_c12                                  |                                      | baseline |
-#RUN | cpld_control_c24                                  |                                      | baseline |
-
-RUN | cpld_control_c12                                  |                                      | baseline |
-RUN | cpld_warmstart_c12                                | - noaacloud                          | baseline |
-RUN | cpld_restart_c12                                  | - noaacloud                          |          | cpld_warmstart_c12
+RUN | cpld_control_c48                                  |                                      | baseline |
+RUN | cpld_warmstart_c48                                | - noaacloud                          | baseline |
+RUN | cpld_restart_c48                                  | - noaacloud                          |          | cpld_warmstart_c48
 
 RUN | cpld_control_c24                                  |                                      | baseline |
 RUN | cpld_warmstart_c24                                | - noaacloud                          | baseline |
 RUN | cpld_restart_c24                                  | - noaacloud                          |          | cpld_warmstart_c24
+
+RUN | cpld_control_c12                                  |                                      | baseline |
+RUN | cpld_warmstart_c12                                | - noaacloud                          | baseline |
+RUN | cpld_restart_c12                                  | - noaacloud                          |          | cpld_warmstart_c12
diff --git a/tests/tests/cpld_control_c12 b/tests/tests/cpld_control_c12
@@ -71,11 +71,6 @@ export WRTTASK_PER_GROUP=1
 export LSM=1
 export ISATMEDMF=1
 export IMP_PHYSICS=11
-
-# export INPES=$INPES_cpl_c48
-# export JNPES=$JNPES_cpl_c48
-# export atm_omp_num_threads=$THRD_cpl_c48
-# export WRTTASK_PER_GROUP=$WPG_cpl_c48
 export OUTPUT_GRID='gaussian_grid'
 
 export OCN_tasks=2
@@ -99,7 +94,7 @@ export CICE_BLCKX=`expr $NX_GLB / $CICE_NPROC`
 export CICE_BLCKY=$NY_GLB
 
 # set component and coupling timesteps
-export DT_ATMOS=1200
+export DT_ATMOS=1800
 export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6=3600
 export DT_THERM_MOM6=3600
@@ -141,7 +136,7 @@ export FNMSKH="'global_slmask.t62.192.94.grb'"
 
 # resolution dependent setting
 #?
-export CDMBWD=1.0,1.0,1.0,1.0
+export CDMBWD=0.0,0.0,0.0,0.0
 export DT_INNER=${DT_ATMOS}
 
 # no aero, no waves
@@ -157,6 +152,3 @@ export UFS_CONFIGURE=ufs.configure.s2s.IN
 
 export FV3_RUN=cpld_control_run.IN
 export INPUT_NML=cpld_lowres.nml.IN
-# HR4 GFSv17 GWD update
-#export DO_GWD_OPT_PSL=.true.
-#export DO_GSL_DRAG_SS=.false.
diff --git a/tests/tests/cpld_control_c24 b/tests/tests/cpld_control_c24
@@ -70,11 +70,6 @@ export WRTTASK_PER_GROUP=1
 export LSM=1
 export ISATMEDMF=1
 export IMP_PHYSICS=11
-
-# export INPES=$INPES_cpl_c48
-# export JNPES=$JNPES_cpl_c48
-# export atm_omp_num_threads=$THRD_cpl_c48
-# export WRTTASK_PER_GROUP=$WPG_cpl_c48
 export OUTPUT_GRID='gaussian_grid'
 
 export OCN_tasks=4
@@ -138,7 +133,7 @@ export FNMSKH="'global_slmask.t62.192.94.grb'"
 
 # resolution dependent setting
 #?
-export CDMBWD=1.0,1.0,1.0,1.0
+export CDMBWD=0.0,0.0,0.0,0.0
 export DT_INNER=${DT_ATMOS}
 
 # no aero, no waves
@@ -154,6 +149,3 @@ export UFS_CONFIGURE=ufs.configure.s2s.IN
 
 export FV3_RUN=cpld_control_run.IN
 export INPUT_NML=cpld_lowres.nml.IN
-# HR4 GFSv17 GWD update
-#export DO_GWD_OPT_PSL=.true.
-#export DO_GSL_DRAG_SS=.false.