modify default nems.configure

* retain only two nems.configure for cpld model, one with aero as the default and noaero for the gnu jobs * x out cpld p7 tests since they will be removed
DeniseWorthen · Mar 23, 2022 · 7f9e8d0 · 7f9e8d0
1 parent 75817c1
commit 7f9e8d0
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 65 deletions.
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -1118,7 +1118,7 @@ export DT_DYNAM_MOM6=1800
 export DT_THERM_MOM6=3600
 
 # nems.configure defaults
-export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
+export NEMS_CONFIGURE=nems.configure.cpld.IN
 export med_model=cmeps
 export atm_model=fv3
 export chm_model=gocart

diff --git a/tests/parm/nems.configure.cpld.IN b/tests/parm/nems.configure.cpld.IN
@@ -6,7 +6,7 @@
 logKindFlag:            ESMF_LOGKIND_MULTI
 
 # EARTH #
-EARTH_component_list: MED ATM OCN ICE
+EARTH_component_list: MED ATM CHM OCN ICE WAV
 EARTH_attributes::
   Verbosity = 0
 ::
@@ -26,6 +26,13 @@ ATM_attributes::
   OverwriteSlice = true
 ::
 
+# CHM #
+CHM_model:                      @[chm_model]
+CHM_petlist_bounds:             @[chm_petlist_bounds]
+CHM_attributes::
+  Verbosity = 0
+::
+
 # OCN #
 OCN_model:                      @[ocn_model]
 OCN_petlist_bounds:             @[ocn_petlist_bounds]
@@ -51,6 +58,18 @@ ICE_attributes::
   stop_ymd = -999
 ::
 
+# WAV #
+WAV_model:                      @[wav_model]
+WAV_petlist_bounds:             @[wav_petlist_bounds]
+WAV_attributes::
+  Verbosity = 0
+  OverwriteSlice = false
+  diro = "."
+  logfile = wav.log
+  mesh_wav = @[MESHOCN_ICE]
+  multigrid = @[MULTIGRID]
+::
+
 # CMEPS warm run sequence
 runSeq::
 @@[coupling_interval_slow_sec]
@@ -60,14 +79,24 @@ runSeq::
    @@[coupling_interval_fast_sec]
      MED med_phases_prep_atm
      MED med_phases_prep_ice
+     MED med_phases_prep_wav_accum
+     MED med_phases_prep_wav_avg
      MED -> ATM :remapMethod=redist
      MED -> ICE :remapMethod=redist
-     ATM
+     MED -> WAV :remapMethod=redist
+     ATM phase1
+     ATM -> CHM
+     CHM
+     CHM -> ATM
+     ATM phase2
      ICE
+     WAV
      ATM -> MED :remapMethod=redist
      MED med_phases_post_atm
      ICE -> MED :remapMethod=redist
      MED med_phases_post_ice
+     WAV -> MED :remapMethod=redist
+     MED med_phases_post_wav
      MED med_phases_prep_ocn_accum
    @
    OCN -> MED :remapMethod=redist
@@ -85,6 +114,7 @@ MED_attributes::
       ATM_model = @[atm_model]
       ICE_model = @[ice_model]
       OCN_model = @[ocn_model]
+      WAV_model = @[wav_model]
       history_n = 1
       history_option = nhours
       history_ymd = -999

diff --git a/tests/parm/nems.configure.cpld_wave.IN → tests/parm/nems.configure.cpld_noaero.IN b/tests/parm/nems.configure.cpld_wave.IN → tests/parm/nems.configure.cpld_noaero.IN
@@ -6,7 +6,7 @@
 logKindFlag:            ESMF_LOGKIND_MULTI
 
 # EARTH #
-EARTH_component_list: MED ATM CHM OCN ICE WAV
+EARTH_component_list: MED ATM OCN ICE WAV
 EARTH_attributes::
   Verbosity = 0
 ::
@@ -26,13 +26,6 @@ ATM_attributes::
   OverwriteSlice = true
 ::
 
-# CHM #
-CHM_model:                      @[chm_model]
-CHM_petlist_bounds:             @[chm_petlist_bounds]
-CHM_attributes::
-  Verbosity = 0
-::
-
 # OCN #
 OCN_model:                      @[ocn_model]
 OCN_petlist_bounds:             @[ocn_petlist_bounds]
@@ -84,11 +77,7 @@ runSeq::
      MED -> ATM :remapMethod=redist
      MED -> ICE :remapMethod=redist
      MED -> WAV :remapMethod=redist
-     ATM phase1
-     ATM -> CHM
-     CHM
-     CHM -> ATM
-     ATM phase2
+     ATM
      ICE
      WAV
      ATM -> MED :remapMethod=redist

diff --git a/tests/parm/nems.configure.cpld_aero.IN → tests/parm/x.nems.configure.cpld_aero.IN b/tests/parm/nems.configure.cpld_aero.IN → tests/parm/x.nems.configure.cpld_aero.IN
diff --git a/tests/parm/nems.configure.cpld_aero_wave.IN → ...s/parm/x.nems.configure.cpld_aero_wave.IN b/tests/parm/nems.configure.cpld_aero_wave.IN → ...s/parm/x.nems.configure.cpld_aero_wave.IN
diff --git a/tests/tests/cpld_control_c192_p8 b/tests/tests/cpld_control_c192_p8
@@ -129,6 +129,4 @@ export FNABSC="'C192.maximum_snow_albedo.tileX.nc'"
 export CDMBWD=${CDMBWD_c192}
 export DT_INNER=${DT_INNER_c192}
 
-export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_control_c384_p8 b/tests/tests/cpld_control_c384_p8
@@ -125,6 +125,4 @@ export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
 export CDMBWD=${CDMBWD_c384}
 export DT_INNER=${DT_INNER_c384}
 
-export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_control_c96_noaero_p8 b/tests/tests/cpld_control_c96_noaero_p8
@@ -2,7 +2,7 @@
 #  cpld_control C96 noaero P8 test
 #
 
-export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS system - C96MX100"
+export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100"
 
 export CNTL_DIR="cpld_control_c96_noaero_p8"
 
@@ -103,6 +103,6 @@ export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
 
 export DIAG_TABLE=diag_table_template
-export NEMS_CONFIGURE=nems.configure.cpld.IN
+export NEMS_CONFIGURE=nems.configure.cpld_noaero.IN
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_control_c96_p8 b/tests/tests/cpld_control_c96_p8
@@ -82,6 +82,4 @@ export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
-export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_debug_c96_p8 b/tests/tests/cpld_debug_c96_p8
@@ -66,42 +66,8 @@ export DAYS=0.125
 export RESTART_N=${FHMAX}
 export OUTPUT_FH="3 -1"
 
-#export TASKS=$TASKS_cpl_c96
-#export TPN=$TPN_cpl_c96
-#export INPES=$INPES_cpl_c96
-#export JNPES=$JNPES_cpl_c96
-#export THRD=$THRD_cpl_c96
-#export WRTTASK_PER_GROUP=$WPG_cpl_c96
-#
-#export med_petlist_bounds=$MPB_cpl_c96
-#export atm_petlist_bounds=$APB_cpl_c96
-#export chm_petlist_bounds=$CHM_cpl_c96
-#export ocn_petlist_bounds=$OPB_cpl_c96
-#export ice_petlist_bounds=$IPB_cpl_c96
-#export wav_petlist_bounds=$WPB_cpl_c96
-#
-## atm/ocn/ice resolution
-#export NPROC_ICE=$NPROC_ICE_cpl_c96
-#export np2=`expr $NPROC_ICE / 2`
-#export BLCKX=`expr $NX_GLB / $np2`
-#export BLCKY=`expr $NY_GLB / 2`
-
 export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
-#export CPLCHM=.true.
-#export CPLWAV=.true.
-#export CPLWAV2ATM=.true.
-#export MOM6_USE_WAVES=True
-#
-#export WW3RSTDTHR=3
-#export WW3OUTDTHR=3
-#export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
-#export DTFLD="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-#export DTPNT="$(printf "%02d" $(( ${WW3OUTDTHR}*3600 )))"
-
-export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-#export FIELD_TABLE=field_table_thompson_noaero_tke_GOCART
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_debug_noaero_p8 b/tests/tests/cpld_debug_noaero_p8
@@ -85,6 +85,6 @@ export CPLWAV2ATM=.false.
 export MOM6_USE_WAVES=False
 
 export DIAG_TABLE=diag_table_template
-export NEMS_CONFIGURE=nems.configure.cpld.IN
+export NEMS_CONFIGURE=nems.configure.cpld_noaero.IN
 
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c192_p8 b/tests/tests/cpld_restart_c192_p8
@@ -156,6 +156,4 @@ export OUT_BEG=$RUN_BEG
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
 
-export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c384_p8 b/tests/tests/cpld_restart_c384_p8
@@ -153,6 +153,4 @@ export OUT_BEG=$RUN_BEG
 export RST_BEG=$RUN_BEG
 export RST_2_BEG=$RUN_BEG
 
-export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_restart_c96_p8 b/tests/tests/cpld_restart_c96_p8
@@ -96,6 +96,4 @@ export TOPOEDITS=ufs.topo_edits_011818.nc
 export MOM6_ALLOW_LANDMASK_CHANGES=True
 export eps_imesh=2.5e-1
 
-export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
-
 export FV3_RUN=cpld_control_run.IN
diff --git a/tests/tests/cpld_bmark_p7 → tests/tests/x.cpld_bmark_p7 b/tests/tests/cpld_bmark_p7 → tests/tests/x.cpld_bmark_p7
diff --git a/tests/tests/cpld_control_p7_rrtmgp → tests/tests/x.cpld_control_p7_rrtmgp b/tests/tests/cpld_control_p7_rrtmgp → tests/tests/x.cpld_control_p7_rrtmgp