ufs-community · DeniseWorthen · Oct 22, 2020 · Jul 7, 2020 · Jul 7, 2020 · Jul 8, 2020
diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/parm/MOM_input_template_050 b/parm/MOM_input_template_050
diff --git a/parm/MOM_input_template_100 b/parm/MOM_input_template_100
diff --git a/parm/input.mom6_ccpp.nml.IN b/parm/input.mom6_ccpp.nml.IN
@@ -197,9 +197,9 @@
        do_skeb        = @[DO_SKEB]
        lndp_type      = @[LNDP_TYPE]
        n_var_lndp     = @[N_VAR_LNDP]
-       do_ca          = .false.
-       ca_sgs         = .false.
-       nca            = 1
+       do_ca          = @[DO_CA]
+       ca_sgs         = @[CA_SGS]
+       ca_global      = @[CA_GLOBAL]
        ncells         = 5
        nlives         = 30
        nseed          = 1000000

diff --git a/parm/model_configure.IN b/parm/model_configure.IN
@@ -18,7 +18,7 @@ memuse_verbose:          .false.
 atmos_nthreads:          @[THRD]
 use_hyper_thread:        .false.
 ncores_per_node:         24
-restart_interval:        @[FV3_RESTART_H]
+restart_interval:        @[RESTART_INTERVAL]
 fhrot:                   @[FHROT]
 output_1st_tstep_rst:    .false.
 atm_coupling_interval_sec:      @[coupling_interval_fast_sec]

diff --git a/parm/nems.configure.medcmeps_atm_ocn_ice.IN b/parm/nems.configure.medcmeps_atm_ocn_ice.IN
@@ -42,7 +42,7 @@ ICE_attributes::
   ProfileMemory = false
   OverwriteSlice = true
   mesh_ice = @[MESHICE]
-  stop_n = @[FV3_RESTART_H]
+  stop_n = @[RESTART_N]
   stop_option = nhours
   stop_ymd = -999
 ::
@@ -93,8 +93,8 @@ ALLCOMP_attributes::
       ScalarFieldIdxGridNY = 2
       ScalarFieldName = cpl_scalars
       start_type = @[RUNTYPE]
-      case_name = ufs.s2s
-      restart_n = @[FV3_RESTART_H]
+      case_name = ./RESTART/ufs.cpld
+      restart_n = @[RESTART_N]
       restart_option = nhours
       restart_ymd = -999
       dbug_flag = @[cap_dbug_flag]

diff --git a/parm/nems.configure.medcmeps_atm_ocn_ice_wav.IN b/parm/nems.configure.medcmeps_atm_ocn_ice_wav.IN
@@ -42,7 +42,7 @@ ICE_attributes::
   ProfileMemory = false
   OverwriteSlice = true
   mesh_ice = @[MESHICE]
-  stop_n = @[FV3_RESTART_H]
+  stop_n = @[RESTART_N]
   stop_option = nhours
   stop_ymd = -999  
 ::
@@ -107,8 +107,8 @@ ALLCOMP_attributes::
       ScalarFieldIdxGridNY = 2
       ScalarFieldName = cpl_scalars
       start_type = @[RUNTYPE]
-      case_name = ufs.s2s
-      restart_n = @[FV3_RESTART_H]
+      case_name = ./RESTART/ufs.cpld
+      restart_n = @[RESTART_N]
       restart_option = nhours
       restart_ymd = -999
       dbug_flag = @[cap_dbug_flag]

diff --git a/tests/Compile_hera.intel.log b/tests/Compile_hera.intel.log
diff --git a/tests/Compile_orion.intel.log b/tests/Compile_orion.intel.log
diff --git a/tests/Compile_wcoss_dell_p3.log b/tests/Compile_wcoss_dell_p3.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_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -27,11 +27,6 @@ elif [ $MACHINE_ID = wcoss_dell_p3 ]; then
   TASKS_stretch=48 ; TPN_stretch=28 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=28 ; INPES_strnest=2 ; JNPES_strnest=4
 
-  # To be deleted after c96/mx025 tests dropped
-  TASKS_cpl_thrd_ori=246; TPN_cpl_thrd_ori=14; INPES_cpl_thrd_ori=3; JNPES_cpl_thrd_ori=4
-  THRD_cpl_thrd_ori=2; WPG_cpl_thrd_ori=6;  MPB_cpl_thrd_ori="0 77";  APB_cpl_thrd_ori="0 77"
-  OPB_cpl_thrd_ori="78 197";  IPB_cpl_thrd_ori="198 245"
-
   TASKS_cpl_dflt=192; TPN_cpl_dflt=28; 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 179"; IPB_cpl_dflt="180 191"
@@ -63,11 +58,6 @@ elif [[ $MACHINE_ID = orion.* ]]; then
   TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=12 ; INPES_strnest=2 ; JNPES_strnest=4
 
-  # To be deleted after c96/mx025 tests dropped
-  TASKS_cpl_thrd_ori=246; TPN_cpl_thrd_ori=40; INPES_cpl_thrd_ori=3; JNPES_cpl_thrd_ori=4
-  THRD_cpl_thrd_ori=2; WPG_cpl_thrd_ori=6;  MPB_cpl_thrd_ori="0 77";  APB_cpl_thrd_ori="0 77"
-  OPB_cpl_thrd_ori="78 197";  IPB_cpl_thrd_ori="198 245"
-
   TASKS_cpl_dflt=192; 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 179"; IPB_cpl_dflt="180 191"
@@ -99,11 +89,6 @@ elif [[ $MACHINE_ID = hera.* ]]; then
   TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
   TASKS_strnest=96 ; TPN_strnest=12 ; INPES_strnest=2 ; JNPES_strnest=4
 
-  # To be deleted after c96/mx025 tests dropped
-  TASKS_cpl_thrd_ori=246; TPN_cpl_thrd_ori=40; INPES_cpl_thrd_ori=3; JNPES_cpl_thrd_ori=4
-  THRD_cpl_thrd_ori=2; WPG_cpl_thrd_ori=6;  MPB_cpl_thrd_ori="0 77";  APB_cpl_thrd_ori="0 77"
-  OPB_cpl_thrd_ori="78 197";  IPB_cpl_thrd_ori="198 245"
-
   TASKS_cpl_dflt=192; 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 179"; IPB_cpl_dflt="180 191"
@@ -155,11 +140,6 @@ elif [[ $MACHINE_ID = stampede.* ]]; then
   TASKS_thrd=84  ; TPN_thrd=24 ; INPES_thrd=3 ; JNPES_thrd=4
   TASKS_stretch=48 ; TPN_stretch=12 ; INPES_stretch=2 ; JNPES_stretch=4
 
-  # To be deleted after c96/mx025 tests dropped
-  TASKS_cpl_thrd_ori=246; TPN_cpl_thrd_ori=48; INPES_cpl_thrd_ori=3; JNPES_cpl_thrd_ori=4
-  THRD_cpl_thrd_ori=2; WPG_cpl_thrd_ori=6;  MPB_cpl_thrd_ori="0 77";  APB_cpl_thrd_ori="0 77"
-  OPB_cpl_thrd_ori="78 197";  IPB_cpl_thrd_ori="198 245"
-
   TASKS_cpl_dflt=192; TPN_cpl_dflt=48; 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 179"; IPB_cpl_dflt="180 191"
@@ -371,7 +351,7 @@ export wav_model="ww3"
 export coupling_interval_slow_sec=${CPL_SLOW}
 export coupling_interval_fast_sec=${CPL_FAST}
 
-export FV3_RESTART_H=${FHMAX}
+export RESTART_N=${FHMAX}
 export CPLMODE='nems_orig'
 export cap_dbug_flag="0"
 export use_coldstart="false"

diff --git a/tests/fv3_conf/cpld_bmark_run.IN b/tests/fv3_conf/cpld_bmark_run.IN
@@ -58,3 +58,4 @@ cp    @[RTPWD]/${FV3_IC}/gfs_data*.nc ./INPUT
 cp    @[RTPWD]/${MOM6_IC}/MOM*.nc ./INPUT
 # the BM ICs are still named cice5 and need to remain so until P5.0 is completed
 cp    @[RTPWD]/${CICE_IC}/cice5_model_@[ICERES].*.nc ./cice_model.res.nc
+
diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -62,13 +62,12 @@ else
   cp ../${DEP_RUN}/RESTART/MOM*.nc ./INPUT
 
   # CMEPS restart and pointer files
-  #cp  ${DEP_RUN}/RESTART/ufs.s2s.cpl.r.2016-10-05-00000.nc .
-  cp  ../${DEP_RUN}/ufs.s2s.cpl.r.2016-10-05-00000.nc .
-  RFILE="ufs.s2s.cpl.r.2016-10-05-00000.nc"
+  cp  ../${DEP_RUN}/RESTART/ufs.cpld.cpl.r.2016-10-03-43200.nc .
+  RFILE="ufs.cpld.cpl.r.2016-10-03-43200.nc"
   ls -1 ${RFILE}>rpointer.cpl
 
   # CICE restart and pointer files
-  cp  ../${DEP_RUN}/RESTART/iced.2016-10-05-00000.nc ./INPUT
-  RFILE="iced.2016-10-05-00000.nc"
+  cp  ../${DEP_RUN}/RESTART/iced.2016-10-03-43200.nc ./INPUT
+  RFILE="iced.2016-10-03-43200.nc"
   ls -1 "./INPUT/"${RFILE}>ice.restart_file
 fi
diff --git a/tests/fv3_conf/cpld_fv3_mom6_cice_atm_flux_run.IN b/tests/fv3_conf/cpld_fv3_mom6_cice_atm_flux_run.IN
diff --git a/tests/fv3_conf/cpld_fv3_mom6_cice_bmark_35d_run.IN b/tests/fv3_conf/cpld_fv3_mom6_cice_bmark_35d_run.IN
diff --git a/tests/fv3_conf/cpld_fv3_mom6_cice_bmark_rt_run.IN b/tests/fv3_conf/cpld_fv3_mom6_cice_bmark_rt_run.IN
diff --git a/tests/fv3_conf/cpld_fv3_mom6_cice_ww3_bmark_35d_run.IN b/tests/fv3_conf/cpld_fv3_mom6_cice_ww3_bmark_35d_run.IN