Add C-grid capability for CICE6 (#1269)

* update CICE for Cgrid * update CICE with change of F->S * add settings for ice grid options * add GRIDICE, GRIDOCN, GRIDATM to ice_in_template and default vars to specify possible component grid options * add C-grid test for cpld_control_p8
ufs-community · Jul 20, 2022 · d75bed7 · d75bed7
1 parent aed4cab
commit d75bed7
Show file tree

Hide file tree

Showing 17 changed files with 5,914 additions and 5,226 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/CICE-interface/cice_files.cmake b/CICE-interface/cice_files.cmake
@@ -49,7 +49,8 @@ list(APPEND cice_shared_files
   CICE/cicecore/cicedynB/infrastructure/ice_read_write.F90
   CICE/cicecore/cicedynB/infrastructure/ice_restart_driver.F90
   CICE/cicecore/cicedynB/infrastructure/ice_restoring.F90
-)
+  CICE/cicecore/cicedynB/infrastructure/ice_memusage.F90
+  CICE/cicecore/cicedynB/infrastructure/ice_memusage_gptl.c)
 
 
 #Icepack List:

diff --git a/tests/OpnReqTests_cpld_control_ciceC_p8_hera.intel.log b/tests/OpnReqTests_cpld_control_ciceC_p8_hera.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_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
@@ -794,6 +794,10 @@ export RESTART_EXT=.false.
 export FRAZIL_FWSALT=.true.
 # default to write CICE average history files
 export CICE_HIST_AVG=.true.
+# default CICE B-grid, ATM and OCN are provided by cap on A grid
+export GRIDATM=A
+export GRIDOCN=A
+export GRIDICE=B
 
 #wave
 export INPUT_CURFLD='T F     Currents'
@@ -946,6 +950,9 @@ export RESTART_EXT=.false.
 export FRAZIL_FWSALT=.true.
 # default to write CICE average history files
 export CICE_HIST_AVG=.true.
+export GRIDATM=A
+export GRIDOCN=A
+export GRIDICE=B
 # default non-mushy thermo
 export KTHERM=1
 export TFREEZE_OPTION=linear_salt

diff --git a/tests/opnReqTests/fhz.sh b/tests/opnReqTests/fhz.sh
@@ -11,7 +11,7 @@ if [[ $application == 'global' ]]; then
                                    | sed -E "s/GFSPRS.GrbF24 ?//g" \
                                    | sed -e "s/^ *//" -e "s/ *$//")
 elif [[ $application == 'cpld' ]]; then
-  if [[ $TEST_NAME =~ 'cpld_control_c96_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_c96_noaero_p8' ]]; then
+  if [[ $TEST_NAME =~ 'cpld_control_c96_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_c96_noaero_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_ciceC_p8' ]]; then
     FHZERO=3
     LIST_FILES=$(echo -n $LIST_FILES | sed -E "s/sfcf024.tile[1-6].nc ?//g" \
                                      | sed -E "s/atmf024.tile[1-6].nc ?//g" \

diff --git a/tests/opnReqTests/thr.sh b/tests/opnReqTests/thr.sh
@@ -33,7 +33,7 @@ elif [[ $application == 'cpld' ]]; then
       NPROC_ICE=$ICE_tasks
       TASKS=$((INPES*JNPES*NTILES + WRITE_GROUP*WRTTASK_PER_GROUP + OCN_tasks + ICE_tasks))
       NODES=$(((TASKS+TPN-1)/TPN))
-    elif [[ $TEST_NAME =~ 'cpld_control_p8' ]]; then
+    elif [[ $TEST_NAME =~ 'cpld_control_p8' ]] || [[ $TEST_NAME =~ 'cpld_control_ciceC_p8' ]]; then
       INPES=3
       JNPES=4
       OCN_tasks=20

diff --git a/tests/parm/ice_in_template b/tests/parm/ice_in_template
@@ -57,6 +57,9 @@
     nslyr        = 1
     nblyr        = 1
     nfsd         = 1
+    grid_atm     = '@[GRIDATM]'
+    grid_ocn     = '@[GRIDOCN]'
+    grid_ice     = '@[GRIDICE]'
 /
 
 &tracer_nml

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -9,6 +9,7 @@ RUN     | cpld_2threads_p8
 RUN     | cpld_decomp_p8                                                                                                          | - wcoss2.intel                          |     |
 RUN     | cpld_mpi_p8                                                                                                             | - wcoss2.intel                          |     |
 #RUN     | cpld_multigrid_p8                                                                                                       | - wcoss2.intel                          |     |
+RUN     | cpld_control_ciceC_p8                                                                                                   | - wcoss2.intel                          | fv3 |
 
 RUN     | cpld_control_c192_p8                                                                                                    | - wcoss2.intel jet.intel                | fv3 |
 RUN     | cpld_restart_c192_p8                                                                                                    | - wcoss2.intel jet.intel                |     | cpld_control_c192_p8

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

diff --git a/tests/tests/cpld_control_ciceC_p8 b/tests/tests/cpld_control_ciceC_p8
@@ -0,0 +1,91 @@
+#
+#  cpld_control CICE C-grid P8 test
+#
+
+export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 - CICE6 Cgrid"
+
+export CNTL_DIR="cpld_control_ciceC_p8"
+
+export LIST_FILES="sfcf021.tile1.nc \
+                   sfcf021.tile2.nc \
+                   sfcf021.tile3.nc \
+                   sfcf021.tile4.nc \
+                   sfcf021.tile5.nc \
+                   sfcf021.tile6.nc \
+                   atmf021.tile1.nc \
+                   atmf021.tile2.nc \
+                   atmf021.tile3.nc \
+                   atmf021.tile4.nc \
+                   atmf021.tile5.nc \
+                   atmf021.tile6.nc \
+                   sfcf024.tile1.nc \
+                   sfcf024.tile2.nc \
+                   sfcf024.tile3.nc \
+                   sfcf024.tile4.nc \
+                   sfcf024.tile5.nc \
+                   sfcf024.tile6.nc \
+                   atmf024.tile1.nc \
+                   atmf024.tile2.nc \
+                   atmf024.tile3.nc \
+                   atmf024.tile4.nc \
+                   atmf024.tile5.nc \
+                   atmf024.tile6.nc \
+                   gocart.inst_aod.20210323_0600z.nc4 \
+                   RESTART/coupler.res \
+                   RESTART/fv_core.res.nc \
+                   RESTART/fv_core.res.tile1.nc \
+                   RESTART/fv_core.res.tile2.nc \
+                   RESTART/fv_core.res.tile3.nc \
+                   RESTART/fv_core.res.tile4.nc \
+                   RESTART/fv_core.res.tile5.nc \
+                   RESTART/fv_core.res.tile6.nc \
+                   RESTART/fv_srf_wnd.res.tile1.nc \
+                   RESTART/fv_srf_wnd.res.tile2.nc \
+                   RESTART/fv_srf_wnd.res.tile3.nc \
+                   RESTART/fv_srf_wnd.res.tile4.nc \
+                   RESTART/fv_srf_wnd.res.tile5.nc \
+                   RESTART/fv_srf_wnd.res.tile6.nc \
+                   RESTART/fv_tracer.res.tile1.nc \
+                   RESTART/fv_tracer.res.tile2.nc \
+                   RESTART/fv_tracer.res.tile3.nc \
+                   RESTART/fv_tracer.res.tile4.nc \
+                   RESTART/fv_tracer.res.tile5.nc \
+                   RESTART/fv_tracer.res.tile6.nc \
+                   RESTART/phy_data.tile1.nc \
+                   RESTART/phy_data.tile2.nc \
+                   RESTART/phy_data.tile3.nc \
+                   RESTART/phy_data.tile4.nc \
+                   RESTART/phy_data.tile5.nc \
+                   RESTART/phy_data.tile6.nc \
+                   RESTART/sfc_data.tile1.nc \
+                   RESTART/sfc_data.tile2.nc \
+                   RESTART/sfc_data.tile3.nc \
+                   RESTART/sfc_data.tile4.nc \
+                   RESTART/sfc_data.tile5.nc \
+                   RESTART/sfc_data.tile6.nc \
+                   RESTART/MOM.res.nc \
+                   RESTART/iced.2021-03-23-21600.nc \
+                   RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
+                   20210323.060000.out_pnt.ww3 \
+                   20210323.060000.out_grd.ww3 "
+
+export_fv3
+export_cpl
+
+export RESTART_N=12
+export RESTART_INTERVAL="${RESTART_N} -1"
+export OUTPUT_FH='0 21 24'
+
+export TOPOEDITS=ufs.topo_edits_011818.nc
+export MOM6_ALLOW_LANDMASK_CHANGES=True
+export eps_imesh=2.5e-1
+
+export GRIDICE=C
+
+export FV3_RUN=cpld_control_run.IN
+
+if [[ $MACHINE_ID = cheyenne.* ]]; then
+
+  TPN=18
+
+fi