Remove non-frac grid coupled tests (Replacement PR, was #584) (#623) (#…

…628) * make nems_frac the default CPLMODE * make FRAC_GRID=true the default * remove non-frac grid regression tests * change wall clock for debugfrac. This test runs in less than ~5mins * remove additional cpld_bmark and wave tests and their 35d versions * reduce fhmax control_c384 to 12 hours * add optional variables to turn on mushy thermo Co-authored-by: Denise Worthen <denise.worthen@noaa.gov> Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
ufs-community · Jun 8, 2021 · c9027ef · c9027ef
1 parent 0b195b8
commit c9027ef
Show file tree

Hide file tree

Showing 45 changed files with 3,675 additions and 10,921 deletions.
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/default_vars.sh b/tests/default_vars.sh
@@ -661,7 +661,7 @@ export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
 export RESTART_N=${FHMAX}
-export CPLMODE='nems_orig'
+export CPLMODE='nems_frac'
 export cap_dbug_flag="0"
 export use_coldstart="false"
 export use_mommesh="true"
@@ -672,7 +672,7 @@ export RUNTYPE='startup'
 # set frac_grid=.F. but FRAC_GRID_INPUT=.T.
 # to repro existing tests set both frac_grid and FRAC_GRID_INPUT to .F.
 # to run frac_grid, set both frac_grid and FRAC_GRID_INPUTs to .T.
-export FRAC_GRID='.F.'
+export FRAC_GRID='.T.'
 export FRAC_GRID_INPUT='.T.'
 export CCPP_SUITE="FV3_GFS_2017_coupled"
 export INPUT_NML=input.mom6_ccpp.nml.IN
@@ -736,6 +736,9 @@ export RESTART_EXT='.false.'
 export FRAZIL_FWSALT='.true.'
 # default to write CICE average history files
 export CICE_HIST_AVG='.true.'
+# default non-mushy thermo
+export KTHERM=1
+export TFREEZE_OPTION='linear_salt'
 
 #wave
 export ww3gline="'glo_1deg'  'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
@@ -855,6 +858,9 @@ export RESTART_EXT='.false.'
 export FRAZIL_FWSALT='.true.'
 # default to write CICE average history files
 export CICE_HIST_AVG='.true.'
+# default non-mushy thermo
+export KTHERM=1
+export TFREEZE_OPTION='linear_salt'
 export BL_SUFFIX=""
 export RT_SUFFIX=""
 }
@@ -967,6 +973,9 @@ export RESTART_EXT='.false.'
 export FRAZIL_FWSALT='.true.'
 # default to write CICE average history files
 export CICE_HIST_AVG='.true.'
+# default non-mushy thermo
+export KTHERM=1
+export TFREEZE_OPTION='linear_salt'
 export BL_SUFFIX=""
 export RT_SUFFIX=""
 }
diff --git a/tests/edit_inputs.sh b/tests/edit_inputs.sh
@@ -26,7 +26,9 @@ function edit_ice_in {
       -e "s/USE_RESTART_TIME/$USE_RESTART_TIME/g" \
       -e "s/DUMPFREQ_N/$DUMPFREQ_N/g" \
       -e "s/DUMPFREQ/$DUMPFREQ/g" \
-      -e "s/FRAZIL_FWSALT/$FRAZIL_FWSALT/g"
+      -e "s/FRAZIL_FWSALT/$FRAZIL_FWSALT/g" \
+      -e "s/TFREEZE_OPTION/$TFREEZE_OPTION/g" \
+      -e "s/KTHERM/$KTHERM/g"
 }
 
 function edit_mom_input {

diff --git a/tests/parm/ice_in_template b/tests/parm/ice_in_template
@@ -79,7 +79,7 @@
 
 &thermo_nml
     kitd              = 1
-    ktherm            = 1
+    ktherm            = KTHERM
     conduct           = 'MU71'
     a_rapid_mode      =  0.5e-3
     Rac_rapid_mode    =    10.0
@@ -150,7 +150,7 @@
     fbot_xfer_type  = 'constant'
     update_ocn_f    = FRAZIL_FWSALT
     l_mpond_fresh   = .false.
-    tfrz_option     = 'linear_salt'
+    tfrz_option     = 'TFREEZE_OPTION'
     restart_coszen  = .true.
 /
 

diff --git a/tests/parm/input.benchmark_ccpp.nml.IN b/tests/parm/input.benchmark_ccpp.nml.IN