Update CICE6 to allow WW3-CICE6 coupling; add a cdeps test using C-gr…

…id for sea ice dynamics (was ufs-community#1390) (ufs-community#1381) * update ice_in and submodules * cesm_ponds is deprecated so remove from ice_in * fix hafs-wav configurations * turn ice coupling off for all hafs+wav tests * turn current coupling off for hafs-atm-wav test * add a cdeps test using c-grid for CICE6 (NCAR#27)
grantfirl · Aug 30, 2022 · 6ba0369 · 6ba0369
1 parent 5477338
commit 6ba0369
Show file tree

Hide file tree

Showing 16 changed files with 5,351 additions and 5,239 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
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
@@ -1069,7 +1069,7 @@ export DLAT=0.03
 
 # shel.inp
 export INPUT_CURFLD='C F     Currents'
-export INPUT_ICEFLD='C F     Ice concentrations'
+export INPUT_ICEFLD='F F     Ice concentrations'
 # input.nml
 export CPL_IMP_MRG=.true.
 

diff --git a/tests/parm/ice_in_template b/tests/parm/ice_in_template
@@ -69,8 +69,6 @@
     restart_FY   = .false.
     tr_lvl       = .true.
     restart_lvl  = .false.
-    tr_pond_cesm = .false.
-    restart_pond_cesm = .false.
     tr_pond_topo = .false.
     restart_pond_topo = .false.
     tr_pond_lvl  = .true.

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -211,6 +211,7 @@ RUN     | datm_cdeps_restart_cfsr
 RUN     | datm_cdeps_control_gefs                                                                                                 | - wcoss2.intel                          | fv3 |
 RUN     | datm_cdeps_iau_gefs                                                                                                     | - wcoss2.intel                          | fv3 |
 RUN     | datm_cdeps_stochy_gefs                                                                                                  | - wcoss2.intel                          | fv3 |
+RUN     | datm_cdeps_ciceC_cfsr                                                                                                   | - wcoss2.intel                          | fv3 |
 
 RUN     | datm_cdeps_bulk_cfsr                                                                                                    | - wcoss2.intel                          | fv3 |
 RUN     | datm_cdeps_bulk_gefs                                                                                                    | - wcoss2.intel                          | fv3 |

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20220805
+BL_DATE=20220829
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 

diff --git a/tests/tests/datm_cdeps_ciceC_cfsr b/tests/tests/datm_cdeps_ciceC_cfsr
@@ -0,0 +1,24 @@
+#
+#  DATM_CDEPS_MOM6_CICE_CMEPS_CFSR test
+#
+
+export TEST_DESCR="DATM_CDEPS-MOM6-CICE-CMEPS_CFSR - CICE-C-grid"
+
+export CNTL_DIR="datm_cdeps_ciceC_cfsr"
+
+export LIST_FILES="RESTART/MOM.res.nc \
+                   RESTART/iced.2011-10-02-00000.nc \
+                   RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc"
+
+export_datm_cdeps
+export DATM_SRC="CFSR"
+export FILENAME_BASE='cfsr.'
+export IATM=1760
+export JATM=880
+export RESTART_N=12
+export eps_imesh='2.5e-1'
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+export GRIDICE=C
+
+export FV3_RUN=cpld_datm_cdeps.IN
diff --git a/tests/tests/hafs_regional_atm_wav b/tests/tests/hafs_regional_atm_wav
@@ -88,6 +88,8 @@ export CPLWAV=.true.
 export CPLWAV2ATM=.true.
 export CPL_IMP_MRG=.true.
 
+# shel.inp
+export INPUT_CURFLD='F F     Currents'
 export DTFLD="10800"
 export DTPNT="10800"
 export GOFILETYPE=""