Update CICE cap for optional features; use UPP as submodule (was #904) (

#910) * Updates CICE cap for optional features * Adds UPP as a FV3atm submodule * Adds 35d RT test Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov> Co-authored-by: Minsuk Ji <57227195+MinsukJi-NOAA@users.noreply.github.com>
ufs-community · Nov 22, 2021 · 9c78af1 · 9c78af1
1 parent 805421d
commit 9c78af1
Show file tree

Hide file tree

Showing 26 changed files with 2,473 additions and 2,498 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -127,9 +127,6 @@ endif()
 find_package(bacio REQUIRED)
 find_package(sp REQUIRED)
 find_package(w3nco REQUIRED)
-if(INLINE_POST)
-  find_package(upp REQUIRED)
-endif()
 
 # Configure Python
 find_package(Python 3 REQUIRED COMPONENTS Interpreter)

diff --git a/FV3 b/FV3
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
@@ -17,7 +17,6 @@ module load g2tmpl/1.10.0
 module load ip/3.3.3
 module load sp/2.3.3
 module load w3nco/2.4.1
-module load upp/10.0.10
 
 module load gftl-shared/v1.3.3
 module load yafyaml/v0.5.1

diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
@@ -17,7 +17,6 @@ module load g2tmpl/1.10.0
 module load ip/3.3.3
 module load sp/2.3.3
 module load w3nco/2.4.1
-module load upp/10.0.10
 
 module load gftl-shared/v1.3.3
 module load yafyaml/v0.5.1

diff --git a/modulefiles/ufs_wcoss_cray b/modulefiles/ufs_wcoss_cray
@@ -49,12 +49,6 @@ module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
 
-module load gfsio/1.4.1
-module load sfcio/1.4.1
-module load sigio/2.3.2
-
-module load upp/10.0.10
-
 ## WCOSS Cray execution prereqs:
 module load rca
 module load alps

diff --git a/modulefiles/ufs_wcoss_cray_debug b/modulefiles/ufs_wcoss_cray_debug
@@ -49,12 +49,6 @@ module load sp/2.3.3
 module load w3emc/2.7.3
 module load w3nco/2.4.1
 
-module load gfsio/1.4.1
-module load sfcio/1.4.1
-module load sigio/2.3.2
-
-module load upp/10.0.10
-
 ## WCOSS Cray execution prereqs:
 module load rca
 module load alps

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/ci/ci.test b/tests/ci/ci.test
@@ -2,5 +2,5 @@ control
 thr mpi dcp rst bit dbg
 regional_control
 thr dcp
-cpld_control_p7
+cpld_control_c96_p7
 rst dbg
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -293,6 +293,17 @@ elif [[ $MACHINE_ID = linux.* ]]; then
   TASKS_cpl_c96=192; TPN_cpl_c96=40; INPES_cpl_c96=3; JNPES_cpl_c96=8
   THRD_cpl_c96=1; WPG_cpl_c96=6;  MPB_cpl_c96="0 143"; APB_cpl_c96="0 149"
   OPB_cpl_c96="150 179"; IPB_cpl_c96="180 191"
+  NPROC_ICE_cpl_c96=12
+
+  TASKS_cpl_dflt=200; TPN_cpl_dflt=40; INPES_cpl_dflt=3; JNPES_cpl_dflt=8
+  THRD_cpl_dflt=1; WPG_cpl_dflt=6;  MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149"
+  OPB_cpl_dflt="150 169"; IPB_cpl_dflt="170 179"; WPB_cpl_dflt="180 199"
+  NPROC_ICE_cpl_dflt=10
+
+  TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4
+  THRD_cpl_thrd=2; WPG_cpl_thrd=6;  MPB_cpl_thrd="0 71";  APB_cpl_thrd="0 77"
+  OPB_cpl_thrd="78 97";  IPB_cpl_thrd="98 107"; WPB_cpl_thrd="108 119"
+  NPROC_ICE_cpl_thrd=10
 
 elif [[ $MACHINE_ID = jet.* ]]; then
 

diff --git a/tests/parm/control_ca.nml.IN b/tests/parm/control_ca.nml.IN
@@ -183,11 +183,11 @@ deflate_level=1
   ca_sgs         = @[CA_SGS]
   ca_global      = @[CA_GLOBAL]
   nca            = 1
-  ncells         = 5
-  nlives         = 12
+  ncells         = @[NCELLS]
+  nlives         = @[NLIVES]
   nseed          = 100
   nfracseed      = 0.5
-  nthresh        = 18
+  nthresh        = @[NTHRESH]
   ca_trigger     = .True.
   ca_entr        = .False.
   ca_closure     = .False.

diff --git a/tests/parm/input_global_hafs.nml.IN b/tests/parm/input_global_hafs.nml.IN
@@ -228,26 +228,6 @@
        do_skeb        = .false.
        lndp_type      = 0
        n_var_lndp     = 0
-       do_ca          = .false.
-       ca_sgs         = .false.
-       nca            = 1
-       ncells         = 5
-       nlives         = 12
-       nseed          = 1
-       nfracseed      = 0.5
-       ca_trigger     = .false.
-       ca_entr        = .false.
-       ca_closure     = .false.
-       ca_global      = .false.
-       nca_g          = 1
-       ncells_g       = 1
-       nlives_g       = 100
-       nseed_g        = 100
-       ca_smooth      = .false.
-       nspinup        = 1
-       iseed_ca       = 1
-       nsmooth        = 100
-       ca_amplitude   = 0.35
 /
 
  &gfdl_cloud_microphysics_nml

diff --git a/tests/parm/input_nest_hafs.nml.IN b/tests/parm/input_nest_hafs.nml.IN
@@ -217,27 +217,6 @@
        do_skeb        = .false.
        lndp_type      = 0
        n_var_lndp     = 0
-       do_ca          = .false.
-       ca_sgs         = .false.
-       nca            = 1
-       ncells         = 5
-       nlives         = 12
-       nthresh        = 18
-       nseed          = 1
-       nfracseed      = 0.5
-       ca_trigger     = .false.
-       ca_entr        = .false.
-       ca_closure     = .false.
-       ca_global      = .false.
-       nca_g          = 1
-       ncells_g       = 1
-       nlives_g       = 100
-       nseed_g        = 100
-       ca_smooth      = .false.
-       nspinup        = 1
-       iseed_ca       = 1
-       nsmooth        = 100
-       ca_amplitude   = 0.35
 /
 
  &gfdl_cloud_microphysics_nml

diff --git a/tests/parm/input_regional_hafs.nml.IN b/tests/parm/input_regional_hafs.nml.IN
@@ -232,26 +232,6 @@
        do_skeb        = .false.
        lndp_type      = 0
        n_var_lndp     = 0
-       do_ca          = .false.
-       ca_sgs         = .false.
-       nca            = 1
-       ncells         = 5
-       nlives         = 12
-       nseed          = 1
-       nfracseed      = 0.5
-       ca_trigger     = .false.
-       ca_entr        = .false.
-       ca_closure     = .false.
-       ca_global      = .false.
-       nca_g          = 1
-       ncells_g       = 1
-       nlives_g       = 100
-       nseed_g        = 100
-       ca_smooth      = .false.
-       nspinup        = 1
-       iseed_ca       = 1
-       nsmooth        = 100
-       ca_amplitude   = 0.35
 /
 
  &gfdl_cloud_microphysics_nml

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -460,7 +460,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20211116
+BL_DATE=20211119
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/rt_35d.conf b/tests/rt_35d.conf
@@ -2,21 +2,12 @@
 # CPLD Benchmark 35d tests                                                                                                                                                    #
 ###############################################################################################################################################################################
 
-COMPILE | APP=S2SW SUITES=FV3_GFS_v16_coupled,FV3_GFS_v16_coupled_noahmp,FV3_GFS_v16_coupled_nsstNoahmpUGWPv1             | + hera.intel orion.intel gaea.intel  | fv3 |  |
-#RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012010100
-#RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012040100
-#RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012070100
-#RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2012100100
-#RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013010100
-#RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013040100
-#RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013070100
-#RUN     | cpld_bmark_wave_v16_noahmp_35d                                                                                  |                             | fv3 |  | 2013100100
-
-RUN     | cpld_bmark_wave_v16_p7b_35d                                                                                     |                             | fv3 |  | 2012010100
-RUN     | cpld_bmark_wave_v16_p7b_35d                                                                                     |                             | fv3 |  | 2012040100
-RUN     | cpld_bmark_wave_v16_p7b_35d                                                                                     |                             | fv3 |  | 2012070100
-RUN     | cpld_bmark_wave_v16_p7b_35d                                                                                     |                             | fv3 |  | 2012100100
-RUN     | cpld_bmark_wave_v16_p7b_35d                                                                                     |                             | fv3 |  | 2013010100
-RUN     | cpld_bmark_wave_v16_p7b_35d                                                                                     |                             | fv3 |  | 2013040100
-RUN     | cpld_bmark_wave_v16_p7b_35d                                                                                     |                             | fv3 |  | 2013070100
-RUN     | cpld_bmark_wave_v16_p7b_35d                                                                                     |                             | fv3 |  | 2013100100
+COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1                                                   | + hera.intel                         | fv3 |  |
+RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2012010100
+RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2012040100
+RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2012070100
+RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2012100100
+RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2013010100
+RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2013040100
+RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2013070100
+RUN     | cpld_bmark_p7_35d                                                                                               |                             | fv3 |  | 2013100100
diff --git a/tests/tests/control_ca_restart b/tests/tests/control_ca_restart
diff --git a/tests/tests/cpld_bmark_p7_35d b/tests/tests/cpld_bmark_p7_35d
@@ -0,0 +1,107 @@
+#
+#  cpld_bmark_p7 35 day test
+#
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark P7 35 day test"
+
+export CNTL_DIR="cpld_bmark_p7"
+
+export LIST_FILES=""
+
+export_fv3
+export_cpl
+
+export SYEAR
+export SMONTH
+export SDAY=01
+export SHOUR=00
+export SECS=`expr $SHOUR \* 3600`
+export BMIC=.true.
+
+export DAYS=35
+export FHMAX=840
+export RESTART_N=`expr ${FHMAX} - ${FHROT}`
+export WLCLK=480
+
+export TASKS=1700
+export TPN=$TPN_cpl_thrd
+export INPES=12
+export JNPES=16
+export THRD=2
+export WRTTASK_PER_GROUP=88
+
+export med_petlist_bounds="0 299"
+export atm_petlist_bounds="0 1239"
+export ocn_petlist_bounds="1240 1459"
+export ice_petlist_bounds="1460 1539"
+export wav_petlist_bounds="1540 1699"
+
+# atm/ocn/ice resolution
+export ATMRES=C384
+export NPX=385
+export NPY=385
+export IMO=1536
+export JMO=768
+export OUTPUT_GRID="'gaussian_grid'"
+
+export OCNRES=025
+export ICERES=0.25
+export NX_GLB=1440
+export NY_GLB=1080
+export NPROC_ICE=80
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
+
+# resolution dependent setting
+export CDMBWD=${CDMBWD_c384}
+
+# set component and coupling timesteps
+export DT_ATMOS=300
+export DT_CICE=${DT_ATMOS}
+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}
+
+export CPLWAV=.true.
+export CPLWAV2ATM=.true.
+
+# resolution dependent files
+export MOM_INPUT=MOM_input_template_${OCNRES}
+export MESHOCN_ICE=mesh.mx${OCNRES}.nc
+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 FNALBC="'C384.snowfree_albedo.tileX.nc'"
+export FNALBC2="'C384.facsf.tileX.nc'"
+export FNTG3C="'C384.substrate_temperature.tileX.nc'"
+export FNVEGC="'C384.vegetation_greenness.tileX.nc'"
+export FNVETC="'C384.vegetation_type.tileX.nc'"
+export FNSOTC="'C384.soil_type.tileX.nc'"
+export FNVMNC="'C384.vegetation_greenness.tileX.nc'"
+export FNVMXC="'C384.vegetation_greenness.tileX.nc'"
+export FNSLPC="'C384.slope_type.tileX.nc'"
+export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
+
+export MOM6_USE_WAVES=True
+export MOM6_RIVER_RUNOFF=True
+export MOM6_RESTART_SETTING=r
+
+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 FV3_RUN=cpld_control_run.IN