diff --git a/modulefiles/tasks/linux/make_grid.local b/modulefiles/tasks/linux/make_grid.local
index 52955b476..2cc60006f 100644
--- a/modulefiles/tasks/linux/make_grid.local
+++ b/modulefiles/tasks/linux/make_grid.local
@@ -1,5 +1,5 @@
 #%Module
-module use -a /contrib/miniconda3/modulefiles
+module use -a /contrib/apps/miniconda3/modulefiles
 module load miniconda3
 if [module-info mode load] {
   system "conda activate regional_workflow"
diff --git a/modulefiles/tasks/linux/make_ics.local b/modulefiles/tasks/linux/make_ics.local
index 52955b476..2cc60006f 100644
--- a/modulefiles/tasks/linux/make_ics.local
+++ b/modulefiles/tasks/linux/make_ics.local
@@ -1,5 +1,5 @@
 #%Module
-module use -a /contrib/miniconda3/modulefiles
+module use -a /contrib/apps/miniconda3/modulefiles
 module load miniconda3
 if [module-info mode load] {
   system "conda activate regional_workflow"
diff --git a/modulefiles/tasks/linux/make_lbcs.local b/modulefiles/tasks/linux/make_lbcs.local
index 52955b476..2cc60006f 100644
--- a/modulefiles/tasks/linux/make_lbcs.local
+++ b/modulefiles/tasks/linux/make_lbcs.local
@@ -1,5 +1,5 @@
 #%Module
-module use -a /contrib/miniconda3/modulefiles
+module use -a /contrib/apps/miniconda3/modulefiles
 module load miniconda3
 if [module-info mode load] {
   system "conda activate regional_workflow"
diff --git a/modulefiles/tasks/linux/run_fcst.local b/modulefiles/tasks/linux/run_fcst.local
index 52955b476..2cc60006f 100644
--- a/modulefiles/tasks/linux/run_fcst.local
+++ b/modulefiles/tasks/linux/run_fcst.local
@@ -1,5 +1,5 @@
 #%Module
-module use -a /contrib/miniconda3/modulefiles
+module use -a /contrib/apps/miniconda3/modulefiles
 module load miniconda3
 if [module-info mode load] {
   system "conda activate regional_workflow"
diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
index 8702d7ffb..305d108d1 100755
--- a/scripts/exregional_run_fcst.sh
+++ b/scripts/exregional_run_fcst.sh
@@ -419,7 +419,7 @@ if [ "${RUN_ENVIR}" != "nco" ] && [ "${MACHINE}" != "WCOSS_CRAY" ] ; then
 fi
 
 ln_vrfy -sf ${relative_or_null} ${DATA_TABLE_FP} ${run_dir}
-ln_vrfy -sf ${relative_or_null} ${FIELD_TABLE_FP} ${run_dir}
+ln_vrfy -sf ${relative_or_null} "${FIELD_TABLE_FP[$(( 10#${ensmem_indx}-1 ))]}" ${run_dir}/${FIELD_TABLE_FN}
 ln_vrfy -sf ${relative_or_null} ${NEMS_CONFIG_FP} ${run_dir}
 
 if [ "${DO_ENSEMBLE}" = TRUE ]; then
@@ -476,6 +476,42 @@ if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
   diag_table_fp="${cycle_dir}/${DIAG_TABLE_FN}"
   ln_vrfy -sf ${relative_or_null} ${diag_table_fp} ${run_dir}
 fi
+
+#
+#-----------------------------------------------------------------------
+#
+# Copy and create files for inline post
+#
+#-----------------------------------------------------------------------
+#
+
+cat > itag <<EOF
+
+ &NAMPGB
+ KPO=47,PO=1000.,975.,950.,925.,900.,875.,850.,825.,800.,775.,750.,725.,700.,675.,650.,625.,600.,575.,550.,525.,500.,475.,450.,425.,400.,375.,350.,325.,300.,275.,250.,225.,200.,175.,150.,125.,100.,70.,50.,30.,20.,10.,7.,5.,3.,2.,1.,
+   /
+EOF
+
+if [ ${USE_CUSTOM_POST_CONFIG_FILE} = "TRUE" ]; then
+  post_config_fp="${CUSTOM_POST_CONFIG_FP}"
+  print_info_msg "
+====================================================================
+Copying the user-defined post flat file specified by
+CUSTOM_POST_CONFIG_FP to the forecast run directory (fhr_dir):
+  CUSTOM_POST_CONFIG_FP = \"${CUSTOM_POST_CONFIG_FP}\"
+===================================================================="
+else
+  post_config_fp="${UFS_WTHR_MDL_DIR}/tests/parm/postxconfig-NT-fv3lam.txt"
+  print_info_msg "
+====================================================================
+Copying the default post flat file specified by post_config_fp to the
+forecast run directory (fhr_dir): post_config_fp = \"${post_config_fp}\"
+===================================================================="
+fi
+cp_vrfy ${post_config_fp} ./postxconfig-NT.txt
+cp_vrfy ${post_config_fp} ./postxconfig-NT_FH00.txt
+cp_vrfy ${UFS_WTHR_MDL_DIR}/tests/parm/params_grib2_tbl_new ./params_grib2_tbl_new
+
 #
 #-----------------------------------------------------------------------
 #
@@ -485,7 +521,6 @@ fi
 #
 export KMP_AFFINITY=scatter
 export OMP_NUM_THREADS=${OMP_NUM_THREADS:-1} #Needs to be 1 for dynamic build of CCPP with GFDL fast physics, was 2 before.
-export OMP_STACKSIZE=1024m
 
 #
 #-----------------------------------------------------------------------
diff --git a/ush/README.HWT_ENS b/ush/README.HWT_ENS
new file mode 100644
index 000000000..d92422f52
--- /dev/null
+++ b/ush/README.HWT_ENS
@@ -0,0 +1,57 @@
+
+
+# HWT Ensemble
+
+## Description
+
+The ensemble for the HWT Spring Experiment 2021 is a 9 member forecast
+ensemble run to 60 hours at 00 UTC daily. It is run on the North
+American (NA) 3km domain, and mixes in ICS/LBCS external models and
+pertubations, multiple physics packages, and multiple stochastic physics
+approaches to acheive a more desirable spread in forcasts. The sections
+below provide details of the variations among members.
+
+
+## ICS/LBCS
+The ICS and LBCS come from both the GFS and GEFS using 6 hour forecasts
+from 18 UTC as follows:
+
+  - Members 1-3 have GFS ICS/LBCS
+  - Members 4-6 have GEFS Member 01 ICS/LBCS
+  - Members 7-9 have GEFS Member 02 ICS/LBCS
+
+Below, these sets will be referred to as "sub-ensembles".
+
+## Physics
+
+Each sub-ensemble will run with varying physics in each member. Here is
+an example of the GFS sub-ensemble, and the same pattern applies to
+each sub-ensemble:
+
+  - Member 1: FV3_GFS_v15_thompson_mynn CCPP Suite
+  - Member 2: GFSv16 (without parameterized convection)
+  - Member 3: ???
+
+
+## Stochastic perturbations
+
+Each sub-ensemble will be treated with the same stochastic
+perturbations for all members:
+
+  - Members 1-3: None
+  - Members 4-6: SPPT
+  - Members 7-9: SPPT/SHUM/SKEB
+
+# Configuring the ensemble
+
+The configuration layer doesn't currently handle this type of mixed
+ensemble. Instead there is a manual method to do this work:
+
+1. Configure each sub-ensemble using different RUN and NET variables
+(RRFS_NA_GFS, RRFS_NA_GEFS01, RRFS_NA_GEFS02)
+
+  - Each configuration stage will generate 3 namelists with varying
+  seed values for stochastic physics. 
+2. Turn on each rocotorun job in the crontab.
+
+
diff --git a/ush/config.sh.gefs01 b/ush/config.sh.gefs01
index bb54c6f5d..97a1d3dff 100644
--- a/ush/config.sh.gefs01
+++ b/ush/config.sh.gefs01
@@ -12,8 +12,8 @@ RUN_CMD_POST="srun --mpi=pmi2"
 
 NCORES_PER_NODE="36"
 PPN_RUN_FCST="18"
-LAYOUT_X="36"
-LAYOUT_Y="18"
+LAYOUT_X="18"
+LAYOUT_Y="36"
 WRTCMP_write_groups="1"
 WRTCMP_write_tasks_per_group="72"
 
@@ -28,8 +28,8 @@ LMOD_PATH="/apps/lmod/lmod/init/sh"
 BUILD_ENV_FN="build_aws_intel.env"
 
 # Copied directly from setup.sh HERA settings
-DO_ENSEMBLE="FALSE"
-NUM_ENS_MEMBERS="1"
+DO_ENSEMBLE="TRUE"
+NUM_ENS_MEMBERS="2"
 NDIGITS_ENSMEM_NAMES="2"
 
 # Get external model files staged on disk
@@ -53,6 +53,7 @@ PREEXISTING_DIR_METHOD="rename"
 QUILTING="TRUE"
 
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
+SUITES=( FV3_GFS_v15_thompson_mynn rrfs_gfsv16 )
 FCST_LEN_HRS="3"
 LBC_SPEC_INTVL_HRS="3"
 
@@ -73,3 +74,4 @@ FIXgsm=${FIXgsm:-"/lustre/NCEPDEV/global/glopara/fix/fix_am"}
 TOPO_DIR=${TOPO_DIR:-"/lustre/NCEPDEV/global/glopara/fix/fix_orog"}
 SFC_CLIMO_INPUT_DIR=${SFC_CLIMO_INPUT_DIR:-"/lustre/NCEPDEV/global/glopara/fix/fix_sfc_climo"}
 FIXLAM_NCO_BASEDIR=${FIXLAM_NCO_BASEDIR:-"/lustre/NCEPDEV/global/glopara/fix"}
+
diff --git a/ush/config.sh.gfs b/ush/config.sh.gfs
index 5c319efc5..90eaf21cc 100644
--- a/ush/config.sh.gfs
+++ b/ush/config.sh.gfs
@@ -12,8 +12,8 @@ RUN_CMD_POST="srun --mpi=pmi2"
 
 NCORES_PER_NODE="36"
 PPN_RUN_FCST="18"
-LAYOUT_X="36"
-LAYOUT_Y="18"
+LAYOUT_X="18"
+LAYOUT_Y="36"
 WRTCMP_write_groups="1"
 WRTCMP_write_tasks_per_group="72"
 
@@ -28,8 +28,8 @@ LMOD_PATH="/apps/lmod/lmod/init/sh"
 BUILD_ENV_FN="build_aws_intel.env"
 
 # Copied directly from setup.sh HERA settings
-DO_ENSEMBLE="FALSE"
-NUM_ENS_MEMBERS="1"
+DO_ENSEMBLE="TRUE"
+NUM_ENS_MEMBERS="2"
 NDIGITS_ENSMEM_NAMES="2"
 
 # Get external model files staged on disk
@@ -54,6 +54,7 @@ PREEXISTING_DIR_METHOD="rename"
 QUILTING="TRUE"
 
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
+SUITES=( FV3_GFS_v15_thompson_mynn rrfs_gfsv16 )
 FCST_LEN_HRS="3"
 LBC_SPEC_INTVL_HRS="3"
 
diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
index 23c7a229c..97f06de77 100644
--- a/ush/config_defaults.sh
+++ b/ush/config_defaults.sh
@@ -539,6 +539,7 @@ EXTRN_MDL_FILES_LBCS=( "LBCS_file1" "LBCS_file2" "..." )
 #-----------------------------------------------------------------------
 #
 CCPP_PHYS_SUITE="FV3_GFS_v15p2"
+SUITES=( $CCPP_PHYS_SUITE )
 #
 #-----------------------------------------------------------------------
 #
diff --git a/ush/create_diag_table_file.sh b/ush/create_diag_table_file.sh
index 1b8ac34c7..3ad2c0172 100644
--- a/ush/create_diag_table_file.sh
+++ b/ush/create_diag_table_file.sh
@@ -67,6 +67,7 @@ function create_diag_table_file() {
 #-----------------------------------------------------------------------
 #
   local i \
+        ensmem \
         diag_table_fp \
         settings
 #
@@ -76,6 +77,9 @@ function create_diag_table_file() {
 #
 #-----------------------------------------------------------------------
 #
+
+ensmem=$(( ${ENSMEM_INDX} - 1 ))
+
   print_info_msg "$VERBOSE" "                                            
 Creating a diagnostics table file (\"${DIAG_TABLE_FN}\")  in the
 specified run
@@ -89,7 +93,7 @@ directory (run_dir):
   print_info_msg "$VERBOSE" "
 Using the template diagnostics table file:
 
-  diag_table_tmpl_fp = ${DIAG_TABLE_TMPL_FP}
+  diag_table_tmpl_fp = ${DIAG_TABLE_TMPL_FP[$ensmem]}
 
 to create:
 
@@ -100,7 +104,7 @@ to create:
   cres: ${CRES}
 "
 
-  $USHDIR/fill_jinja_template.py -q -u "${settings}" -t "${DIAG_TABLE_TMPL_FP}" -o "${diag_table_fp}" || \
+  $USHDIR/fill_jinja_template.py -q -u "${settings}" -t "${DIAG_TABLE_TMPL_FP[$ensmem]}" -o "${diag_table_fp}" || \
   print_err_msg_exit "
 !!!!!!!!!!!!!!!!!
 
diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh
index fded5bdf9..2b369d2b3 100755
--- a/ush/generate_FV3LAM_wflow.sh
+++ b/ush/generate_FV3LAM_wflow.sh
@@ -463,238 +463,248 @@ print_info_msg "$VERBOSE" "
   Copying the template data table file to the experiment directory..."
 cp_vrfy "${DATA_TABLE_TMPL_FP}" "${DATA_TABLE_FP}"
 
-print_info_msg "$VERBOSE" "
-  Copying the template field table file to the experiment directory..."
-cp_vrfy "${FIELD_TABLE_TMPL_FP}" "${FIELD_TABLE_FP}"
-
 print_info_msg "$VERBOSE" "
   Copying the template NEMS configuration file to the experiment direct-
   ory..."
 cp_vrfy "${NEMS_CONFIG_TMPL_FP}" "${NEMS_CONFIG_FP}"
-#
-# Copy the CCPP physics suite definition file from its location in the
-# clone of the FV3 code repository to the experiment directory (EXPT-
-# DIR).
-#
-print_info_msg "$VERBOSE" "
-Copying the CCPP physics suite definition XML file from its location in
-the forecast model directory sturcture to the experiment directory..."
-cp_vrfy "${CCPP_PHYS_SUITE_IN_CCPP_FP}" "${CCPP_PHYS_SUITE_FP}"
-#
-#-----------------------------------------------------------------------
-#
-# Set parameters in the FV3-LAM namelist file.
-#
-#-----------------------------------------------------------------------
-#
-print_info_msg "$VERBOSE" "
-Setting parameters in FV3 namelist file (FV3_NML_FP):
-  FV3_NML_FP = \"${FV3_NML_FP}\""
-#
-# Set npx and npy, which are just NX plus 1 and NY plus 1, respectively.
-# These need to be set in the FV3-LAM Fortran namelist file.  They represent
-# the number of cell vertices in the x and y directions on the regional
-# grid.
-#
-npx=$((NX+1))
-npy=$((NY+1))
-#
-# For the physics suites that use RUC-LSM, set the parameter
-# lsoil according to the external models used to obtain ICs and LBCs.
-#
-if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-   [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
-
-  if [ "${EXTRN_MDL_NAME_ICS}" = "NAM" ] || \
-     [ "${EXTRN_MDL_NAME_ICS}" = "GSMGFS" ] || \
-     [ "${EXTRN_MDL_NAME_ICS}" = "GEFS" ] || \
-     [ "${EXTRN_MDL_NAME_ICS}" = "FV3GFS" ]; then
-    lsoil=4
-  elif [ "${EXTRN_MDL_NAME_ICS}" = "RAP" ] || \
-       [ "${EXTRN_MDL_NAME_ICS}" = "HRRR" ]; then
-    lsoil=9
-  else
-    print_err_msg_exit "\
-The value to set the variable lsoil to in the FV3 namelist file (FV3_NML_FP)
-has not been specified for the following combination of physics suite and
-external model for ICs:
-  CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\"
-  EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\"
-Please change one or more of these parameters or provide a value for lsoil
-(and change workflow generation script(s) accordingly) and rerun."
-  fi
 
-fi
-#
-# Create a multiline variable that consists of a yaml-compliant string
-# specifying the values that the namelist variables that are physics-
-# suite-independent need to be set to.  Below, this variable will be
-# passed to a python script that will in turn set the values of these
-# variables in the namelist file.
-#
-settings="\
-'atmos_model_nml': {
-    'blocksize': $BLOCKSIZE,
-    'ccpp_suite': ${CCPP_PHYS_SUITE},
-  }
-'fv_core_nml': {
-    'target_lon': ${LON_CTR},
-    'target_lat': ${LAT_CTR},
-    'nrows_blend': ${HALO_BLEND},
-#
-# Question:
-# For a ESGgrid type grid, what should stretch_fac be set to?  This depends
-# on how the FV3 code uses the stretch_fac parameter in the namelist file.
-# Recall that for a ESGgrid, it gets set in the function set_gridparams_ESGgrid(.sh)
-# to something like 0.9999, but is it ok to set it to that here in the
-# FV3 namelist file?
-#
-    'stretch_fac': ${STRETCH_FAC},
-    'npx': $npx,
-    'npy': $npy,
-    'layout': [${LAYOUT_X}, ${LAYOUT_Y}],
-    'bc_update_interval': ${LBC_SPEC_INTVL_HRS},
-  }
-'gfs_physics_nml': {
-    'lsoil': ${lsoil:-null},
-    'do_shum': ${DO_SHUM},
-    'do_sppt': ${DO_SPPT},
-    'do_skeb': ${DO_SKEB},
-  }
-'nam_stochy': {
-    'shum': ${SHUM_MAG},
-    'shum_lscale': ${SHUM_LSCALE},
-    'shum_tau': ${SHUM_TSCALE},
-    'shumint': ${SHUM_INT},
-    'sppt': ${SPPT_MAG},
-    'sppt_lscale': ${SPPT_LSCALE},
-    'sppt_tau': ${SPPT_TSCALE},
-    'spptint': ${SPPT_INT},
-    'skeb': ${SKEB_MAG},
-    'skeb_lscale': ${SKEB_LSCALE},
-    'skeb_tau': ${SKEB_TSCALE},
-    'skebint': ${SKEB_INT},
-    'skeb_vdof': ${SKEB_VDOF},
-    'use_zmtnblck': ${USE_ZMTNBLCK},
-  }"
-#
-# Add to "settings" the values of those namelist variables that specify
-# the paths to fixed files in the FIXam directory.  As above, these namelist
-# variables are physcs-suite-independent.
-#
-# Note that the array FV3_NML_VARNAME_TO_FIXam_FILES_MAPPING contains
-# the mapping between the namelist variables and the names of the files
-# in the FIXam directory.  Here, we loop through this array and process
-# each element to construct each line of "settings".
-#
-settings="$settings
-'namsfc': {"
-
-dummy_run_dir="$EXPTDIR/any_cyc"
-if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
-  dummy_run_dir="${dummy_run_dir}/any_ensmem"
-fi
-
-regex_search="^[ ]*([^| ]+)[ ]*[|][ ]*([^| ]+)[ ]*$"
-num_nml_vars=${#FV3_NML_VARNAME_TO_FIXam_FILES_MAPPING[@]}
-for (( i=0; i<${num_nml_vars}; i++ )); do
+for (( suite=0; suite<${#SUITES[@]}; suite++ )); do
 
-  mapping="${FV3_NML_VARNAME_TO_FIXam_FILES_MAPPING[$i]}"
-  nml_var_name=$( printf "%s\n" "$mapping" | \
-                  $SED -n -r -e "s/${regex_search}/\1/p" )
-  FIXam_fn=$( printf "%s\n" "$mapping" |
-              $SED -n -r -e "s/${regex_search}/\2/p" )
-
-  fp="\"\""
-  if [ ! -z "${FIXam_fn}" ]; then
-    fp="$FIXam/${FIXam_fn}"
-#
-# If not in NCO mode, for portability and brevity, change fp so that it
-# is a relative path (relative to any cycle directory immediately under
-# the experiment directory).
-#
-    if [ "${RUN_ENVIR}" != "nco" ]; then
-      fp=$( realpath --canonicalize-missing --relative-to="${dummy_run_dir}" "$fp" )
+  print_info_msg "$VERBOSE" "
+    Copying the template field table file to the experiment directory..."
+  cp_vrfy "${FIELD_TABLE_TMPL_FP[$suite]}" "${FIELD_TABLE_FP[$suite]}"
+
+  #
+  # Copy the CCPP physics suite definition file from its location in the
+  # clone of the FV3 code repository to the experiment directory (EXPT-
+  # DIR).
+  #
+  print_info_msg "$VERBOSE" "
+  Copying the CCPP physics suite definition XML file from its location in
+  the forecast model directory sturcture to the experiment directory..."
+  cp_vrfy "${CCPP_PHYS_SUITE_IN_CCPP_FP[$suite]}" \
+    "${CCPP_PHYS_SUITE_FP[$suite]}"
+  #
+  #-----------------------------------------------------------------------
+  #
+  # Set parameters in the FV3-LAM namelist file.
+  #
+  #-----------------------------------------------------------------------
+  #
+  print_info_msg "$VERBOSE" "
+  Setting parameters in FV3 namelist file (FV3_NML_FP):
+    FV3_NML_FP = \"${FV3_NML_FP}\""
+  #
+  # Set npx and npy, which are just NX plus 1 and NY plus 1, respectively.
+  # These need to be set in the FV3-LAM Fortran namelist file.  They represent
+  # the number of cell vertices in the x and y directions on the regional
+  # grid.
+  #
+  npx=$((NX+1))
+  npy=$((NY+1))
+  #
+  # For the physics suites that use RUC-LSM, set the parameter
+  # lsoil according to the external models used to obtain ICs and LBCs.
+  #
+  if [ "${SUITES[$suite]}" = "FV3_GSD_v0" ] || \
+     [ "${SUITES[$suite]}" = "FV3_GSD_SAR" ]; then
+  
+    if [ "${EXTRN_MDL_NAME_ICS}" = "NAM" ] || \
+       [ "${EXTRN_MDL_NAME_ICS}" = "GSMGFS" ] || \
+       [ "${EXTRN_MDL_NAME_ICS}" = "GEFS" ] || \
+       [ "${EXTRN_MDL_NAME_ICS}" = "FV3GFS" ]; then
+      lsoil=4
+    elif [ "${EXTRN_MDL_NAME_ICS}" = "RAP" ] || \
+         [ "${EXTRN_MDL_NAME_ICS}" = "HRRR" ]; then
+      lsoil=9
+    else
+      print_err_msg_exit "\
+  The value to set the variable lsoil to in the FV3 namelist file (FV3_NML_FP)
+  has not been specified for the following combination of physics suite and
+  external model for ICs:
+    CCPP_PHYS_SUITE = \"${SUITES[$suite]}\"
+    EXTRN_MDL_NAME_ICS = \"${EXTRN_MDL_NAME_ICS}\"
+  Please change one or more of these parameters or provide a value for lsoil
+  (and change workflow generation script(s) accordingly) and rerun."
     fi
+
   fi
-#
-# Add a line to the variable "settings" that specifies (in a yaml-compliant
-# format) the name of the current namelist variable and the value it should
-# be set to.
-#
+  #
+  # Create a multiline variable that consists of a yaml-compliant string
+  # specifying the values that the namelist variables that are physics-
+  # suite-independent need to be set to.  Below, this variable will be
+  # passed to a python script that will in turn set the values of these
+  # variables in the namelist file.
+  #
+  settings="\
+  'atmos_model_nml': {
+      'blocksize': $BLOCKSIZE,
+      'ccpp_suite': ${SUITES[$suite]},
+    }
+  'fv_core_nml': {
+      'target_lon': ${LON_CTR},
+      'target_lat': ${LAT_CTR},
+      'nrows_blend': ${HALO_BLEND},
+  #
+  # Question:
+  # For a ESGgrid type grid, what should stretch_fac be set to?  This depends
+  # on how the FV3 code uses the stretch_fac parameter in the namelist file.
+  # Recall that for a ESGgrid, it gets set in the function set_gridparams_ESGgrid(.sh)
+  # to something like 0.9999, but is it ok to set it to that here in the
+  # FV3 namelist file?
+  #
+      'stretch_fac': ${STRETCH_FAC},
+      'npx': $npx,
+      'npy': $npy,
+      'layout': [${LAYOUT_X}, ${LAYOUT_Y}],
+      'bc_update_interval': ${LBC_SPEC_INTVL_HRS},
+    }
+  'gfs_physics_nml': {
+      'lsoil': ${lsoil:-null},
+      'do_shum': ${DO_SHUM},
+      'do_sppt': ${DO_SPPT},
+      'do_skeb': ${DO_SKEB},
+    }
+  'nam_stochy': {
+      'shum': ${SHUM_MAG},
+      'shum_lscale': ${SHUM_LSCALE},
+      'shum_tau': ${SHUM_TSCALE},
+      'shumint': ${SHUM_INT},
+      'sppt': ${SPPT_MAG},
+      'sppt_lscale': ${SPPT_LSCALE},
+      'sppt_tau': ${SPPT_TSCALE},
+      'spptint': ${SPPT_INT},
+      'skeb': ${SKEB_MAG},
+      'skeb_lscale': ${SKEB_LSCALE},
+      'skeb_tau': ${SKEB_TSCALE},
+      'skebint': ${SKEB_INT},
+      'skeb_vdof': ${SKEB_VDOF},
+      'use_zmtnblck': ${USE_ZMTNBLCK},
+    }"
+  #
+  # Add to "settings" the values of those namelist variables that specify
+  # the paths to fixed files in the FIXam directory.  As above, these namelist
+  # variables are physcs-suite-independent.
+  #
+  # Note that the array FV3_NML_VARNAME_TO_FIXam_FILES_MAPPING contains
+  # the mapping between the namelist variables and the names of the files
+  # in the FIXam directory.  Here, we loop through this array and process
+  # each element to construct each line of "settings".
+  #
   settings="$settings
-    '${nml_var_name}': $fp,"
-
-done
-#
-# Add the closing curly bracket to "settings".
-#
-settings="$settings
-  }"
+  'namsfc': {"
+  
+  dummy_run_dir="$EXPTDIR/any_cyc"
+  if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
+    dummy_run_dir="${dummy_run_dir}/any_ensmem"
+  fi
+  
+  regex_search="^[ ]*([^| ]+)[ ]*[|][ ]*([^| ]+)[ ]*$"
+  num_nml_vars=${#FV3_NML_VARNAME_TO_FIXam_FILES_MAPPING[@]}
+  for (( i=0; i<${num_nml_vars}; i++ )); do
+  
+    mapping="${FV3_NML_VARNAME_TO_FIXam_FILES_MAPPING[$i]}"
+    nml_var_name=$( printf "%s\n" "$mapping" | \
+                    $SED -n -r -e "s/${regex_search}/\1/p" )
+    FIXam_fn=$( printf "%s\n" "$mapping" |
+                $SED -n -r -e "s/${regex_search}/\2/p" )
+  
+    fp="\"\""
+    if [ ! -z "${FIXam_fn}" ]; then
+      fp="$FIXam/${FIXam_fn}"
+  #
+  # If not in NCO mode, for portability and brevity, change fp so that it
+  # is a relative path (relative to any cycle directory immediately under
+  # the experiment directory).
+  #
+      if [ "${RUN_ENVIR}" != "nco" ]; then
+        fp=$( realpath --canonicalize-missing --relative-to="${dummy_run_dir}" "$fp" )
+      fi
+    fi
+  #
+  # Add a line to the variable "settings" that specifies (in a yaml-compliant
+  # format) the name of the current namelist variable and the value it should
+  # be set to.
+  #
+    settings="$settings
+      '${nml_var_name}': $fp,"
+  
+  done
+  #
+  # Add the closing curly bracket to "settings".
+  #
+  settings="$settings
+    }"
+  
+  print_info_msg $VERBOSE "
+  The variable \"settings\" specifying values of the namelist variables
+  has been set as follows:
+  
+  settings =
+  $settings"
+  #
+  #-----------------------------------------------------------------------
+  #
+  # Call the set_namelist.py script to create a new FV3 namelist file (full
+  # path specified by FV3_NML_FP) using the file FV3_NML_BASE_SUITE_FP as
+  # the base (i.e. starting) namelist file, with physics-suite-dependent
+  # modifications to the base file specified in the yaml configuration file
+  # FV3_NML_YAML_CONFIG_FP (for the physics suite specified by CCPP_PHYS_SUITE),
+  # and with additional physics-suite-independent modificaitons specified
+  # in the variable "settings" set above.
+  #
+  #-----------------------------------------------------------------------
+  #
+  $USHDIR/set_namelist.py -q \
+                          -n ${FV3_NML_BASE_SUITE_FP} \
+                          -c ${FV3_NML_YAML_CONFIG_FP} ${SUITES[$suite]} \
+                          -u "$settings" \
+                          -o ${FV3_NML_ENSMEM_FPS[$suite]} || \
+    print_err_msg_exit "\
+  Call to python script set_namelist.py to generate an FV3 namelist file
+  failed.  Parameters passed to this script are:
+    Full path to base namelist file:
+      FV3_NML_BASE_SUITE_FP = \"${FV3_NML_BASE_SUITE_FP}\"
+    Full path to yaml configuration file for various physics suites:
+      FV3_NML_YAML_CONFIG_FP = \"${FV3_NML_YAML_CONFIG_FP}\"
+    Physics suite to extract from yaml configuration file:
+      CCPP_PHYS_SUITE = \"${SUITES[$suite]}\"
+    Full path to output namelist file:
+      FV3_NML_FP = \"${FV3_NML_FP}\"
+    Namelist settings specified on command line:
+      settings =
+  $settings"
+
+  #
+  # If not running the MAKE_GRID_TN task (which implies the workflow will
+  # use pregenerated grid files), set the namelist variables specifying
+  # the paths to surface climatology files.  These files are located in
+  # (or have symlinks that point to them) in the FIXLAM directory.
+  #
+  # Note that if running the MAKE_GRID_TN task, this action usually cannot
+  # be performed here but must be performed in that task because the names
+  # of the surface climatology files depend on the CRES parameter (which is
+  # the C-resolution of the grid), and this parameter is in most workflow
+  # configurations is not known until the grid is created.
+  #
+  if [ "${RUN_TASK_MAKE_GRID}" = "FALSE" ]; then
+
+    set_FV3nml_sfc_climo_filenames mem_num=$suite || print_err_msg_exit "\
+  Call to function to set surface climatology file names in the FV3 namelist
+  file failed."
 
-print_info_msg $VERBOSE "
-The variable \"settings\" specifying values of the namelist variables
-has been set as follows:
+  fi
 
-settings =
-$settings"
-#
-#-----------------------------------------------------------------------
-#
-# Call the set_namelist.py script to create a new FV3 namelist file (full
-# path specified by FV3_NML_FP) using the file FV3_NML_BASE_SUITE_FP as
-# the base (i.e. starting) namelist file, with physics-suite-dependent
-# modifications to the base file specified in the yaml configuration file
-# FV3_NML_YAML_CONFIG_FP (for the physics suite specified by CCPP_PHYS_SUITE),
-# and with additional physics-suite-independent modificaitons specified
-# in the variable "settings" set above.
-#
-#-----------------------------------------------------------------------
-#
-$USHDIR/set_namelist.py -q \
-                        -n ${FV3_NML_BASE_SUITE_FP} \
-                        -c ${FV3_NML_YAML_CONFIG_FP} ${CCPP_PHYS_SUITE} \
-                        -u "$settings" \
-                        -o ${FV3_NML_FP} || \
-  print_err_msg_exit "\
-Call to python script set_namelist.py to generate an FV3 namelist file
-failed.  Parameters passed to this script are:
-  Full path to base namelist file:
-    FV3_NML_BASE_SUITE_FP = \"${FV3_NML_BASE_SUITE_FP}\"
-  Full path to yaml configuration file for various physics suites:
-    FV3_NML_YAML_CONFIG_FP = \"${FV3_NML_YAML_CONFIG_FP}\"
-  Physics suite to extract from yaml configuration file:
-    CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\"
-  Full path to output namelist file:
-    FV3_NML_FP = \"${FV3_NML_FP}\"
-  Namelist settings specified on command line:
-    settings =
-$settings"
-#
-# If not running the MAKE_GRID_TN task (which implies the workflow will
-# use pregenerated grid files), set the namelist variables specifying
-# the paths to surface climatology files.  These files are located in
-# (or have symlinks that point to them) in the FIXLAM directory.
-#
-# Note that if running the MAKE_GRID_TN task, this action usually cannot
-# be performed here but must be performed in that task because the names
-# of the surface climatology files depend on the CRES parameter (which is
-# the C-resolution of the grid), and this parameter is in most workflow
-# configurations is not known until the grid is created.
-#
-if [ "${RUN_TASK_MAKE_GRID}" = "FALSE" ]; then
+done # Namelist generation loop over physics suites
 
-  set_FV3nml_sfc_climo_filenames || print_err_msg_exit "\
-Call to function to set surface climatology file names in the FV3 namelist
-file failed."
 
-  if [ "${DO_ENSEMBLE}" = TRUE ]; then
-    set_FV3nml_stoch_params || print_err_msg_exit "\
+if [ "${DO_ENSEMBLE}" = TRUE ]; then
+  set_FV3nml_stoch_params || print_err_msg_exit "\
 Call to function to set stochastic parameters in the FV3 namelist files
 for the various ensemble members failed."
-  fi
 
 fi
+
 #
 #-----------------------------------------------------------------------
 #
diff --git a/ush/set_FV3nml_sfc_climo_filenames.sh b/ush/set_FV3nml_sfc_climo_filenames.sh
index 13f2ecdf5..5a41ebc97 100644
--- a/ush/set_FV3nml_sfc_climo_filenames.sh
+++ b/ush/set_FV3nml_sfc_climo_filenames.sh
@@ -50,7 +50,7 @@ function set_FV3nml_sfc_climo_filenames() {
 #
 #-----------------------------------------------------------------------
 #
-  local valid_args=()
+local valid_args=( mem_num )
   process_args valid_args "$@"
 #
 #-----------------------------------------------------------------------
@@ -198,26 +198,23 @@ $settings"
 #
 #-----------------------------------------------------------------------
 #
-fv3_nml_base_fp="${FV3_NML_FP}.base"
-mv_vrfy "${FV3_NML_FP}" "${fv3_nml_base_fp}"
 
 $USHDIR/set_namelist.py -q \
-                        -n ${fv3_nml_base_fp} \
+                        -n ${FV3_NML_ENSMEM_FPS[$mem_num]} \
                         -u "$settings" \
-                        -o ${FV3_NML_FP} || \
+                        -o ${FV3_NML_ENSMEM_FPS[$mem_num]} || \
   print_err_msg_exit "\
 Call to python script set_namelist.py to set the variables in the FV3
 namelist file that specify the paths to the surface climatology files
 failed.  Parameters passed to this script are:
   Full path to base namelist file:
-    fv3_nml_base_fp = \"${fv3_nml_base_fp}\"
+    fv3_nml_base_fp = \"${FV3_NML_ENSMEM_FPS[$mem_num]}\"
   Full path to output namelist file:
     FV3_NML_FP = \"${FV3_NML_FP}\"
   Namelist settings specified on command line (these have highest precedence):
     settings =
 $settings"
 
-rm_vrfy "${fv3_nml_base_fp}"
 #
 #-----------------------------------------------------------------------
 #
diff --git a/ush/set_FV3nml_stoch_params.sh b/ush/set_FV3nml_stoch_params.sh
index 61e5bcec9..cc79d1ed7 100644
--- a/ush/set_FV3nml_stoch_params.sh
+++ b/ush/set_FV3nml_stoch_params.sh
@@ -83,20 +83,6 @@ function set_FV3nml_stoch_params() {
 #
 #-----------------------------------------------------------------------
 #
-# At this point, there should exist a namelist file with full path as 
-# specified in the workflow variable FV3_NML_FP.  This is the namelist 
-# file for a non-ensmble-enabled experiment.  This file will be used below 
-# as the base namelist file to which we will add the stochastic "seed" 
-# parameters to obtain the final namelist file for each ensemble member.
-# To clarify that this namelist file is not the final namelist file that
-# FV3 will read in, we now rename it to the name specified in FV3_NML_BASE_ENS_FP.
-#
-#-----------------------------------------------------------------------
-#
-mv_vrfy "${FV3_NML_FP}" "${FV3_NML_BASE_ENS_FP}"
-#
-#-----------------------------------------------------------------------
-#
 # Select a cdate (date and hour, in the 10-digit format YYYYMMDDHH) to
 # use in the formula for generating the stochastic seed values below.  
 # Here, we form cdate the starting date and time of the first forecast.
@@ -108,7 +94,8 @@ cdate="${DATE_FIRST_CYCL}${CYCL_HRS[0]}"
 #-----------------------------------------------------------------------
 #
 # Now loop through the ensemble members and generate a namelist file for
-# each one.
+# each one, overwriting the one that was previously written to the expt
+# directory.
 #
 #-----------------------------------------------------------------------
 #
@@ -116,7 +103,8 @@ for (( i=0; i<${NUM_ENS_MEMBERS}; i++ )); do
 
   fv3_nml_ensmem_fp="${FV3_NML_ENSMEM_FPS[$i]}"
 
-  ip1=$(( i+1 ))
+  # Setting to 1 here specifically for the HWT Ensemble!
+  ip1=$(( 1 ))
   iseed_shum=$(( cdate*1000 + ip1*10 + 2 ))
   iseed_skeb=$(( cdate*1000 + ip1*10 + 3 ))
   iseed_sppt=$(( cdate*1000 + ip1*10 + 1 ))
@@ -129,7 +117,7 @@ for (( i=0; i<${NUM_ENS_MEMBERS}; i++ )); do
   }"
 
   $USHDIR/set_namelist.py -q \
-                          -n ${FV3_NML_BASE_ENS_FP} \
+                          -n ${fv3_nml_ensmem_fp} \
                           -u "$settings" \
                           -o ${fv3_nml_ensmem_fp} || \
     print_err_msg_exit "\
diff --git a/ush/setup.sh b/ush/setup.sh
index 39788e704..5e3e2b1b3 100755
--- a/ush/setup.sh
+++ b/ush/setup.sh
@@ -545,15 +545,18 @@ check_var_valid_value \
 #
 #-----------------------------------------------------------------------
 #
-# Make sure CCPP_PHYS_SUITE is set to a valid value.
+# Make sure all CCPP Physics SUITEs are set to a valid value.
 #
 #-----------------------------------------------------------------------
 #
-err_msg="\
-The CCPP physics suite specified in CCPP_PHYS_SUITE is not supported:
-  CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\""
-check_var_valid_value \
-  "CCPP_PHYS_SUITE" "valid_vals_CCPP_PHYS_SUITE" "${err_msg}"
+
+for suite in ${SUITES[@]} ; do
+  err_msg="\
+  The CCPP physics suite specified in CCPP_PHYS_SUITE is not supported:
+    CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\""
+  check_var_valid_value \
+    "suite" "valid_vals_CCPP_PHYS_SUITE" "${err_msg}"
+done
 #
 #-----------------------------------------------------------------------
 #
@@ -822,25 +825,6 @@ Please clone the external repository containing the code in this direct-
 ory, build the executables, and then rerun the workflow."
 fi
 #
-# Get the base directory of the EMC_post code.
-#
-external_name="EMC_post"
-EMC_POST_DIR=$( \
-get_manage_externals_config_property \
-"${mng_extrns_cfg_fn}" "${external_name}" "${property_name}" ) || \
-print_err_msg_exit "\
-Call to function get_manage_externals_config_property failed."
-
-EMC_POST_DIR="${SR_WX_APP_TOP_DIR}/${EMC_POST_DIR}"
-if [ ! -d "${EMC_POST_DIR}" ]; then
-  print_err_msg_exit "\
-The base directory in which the EMC_post source code should be located
-(EMC_POST_DIR) does not exist:
-  EMS_POST_DIR = \"${EMC_POST_DIR}\"
-Please clone the external repository containing the code in this directory,
-build the executable, and then rerun the workflow."
-fi
-#
 #-----------------------------------------------------------------------
 #
 # Make sure that USE_CUSTOM_POST_CONFIG_FILE is set to a valid value.
@@ -1247,95 +1231,142 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-dot_ccpp_phys_suite_or_null=".${CCPP_PHYS_SUITE}"
 
 DATA_TABLE_TMPL_FN="${DATA_TABLE_FN}"
-DIAG_TABLE_TMPL_FN="${DIAG_TABLE_FN}${dot_ccpp_phys_suite_or_null}"
-FIELD_TABLE_TMPL_FN="${FIELD_TABLE_FN}${dot_ccpp_phys_suite_or_null}"
 MODEL_CONFIG_TMPL_FN="${MODEL_CONFIG_FN}"
 NEMS_CONFIG_TMPL_FN="${NEMS_CONFIG_FN}"
 
 DATA_TABLE_TMPL_FP="${TEMPLATE_DIR}/${DATA_TABLE_TMPL_FN}"
-DIAG_TABLE_TMPL_FP="${TEMPLATE_DIR}/${DIAG_TABLE_TMPL_FN}"
-FIELD_TABLE_TMPL_FP="${TEMPLATE_DIR}/${FIELD_TABLE_TMPL_FN}"
 FV3_NML_BASE_SUITE_FP="${TEMPLATE_DIR}/${FV3_NML_BASE_SUITE_FN}"
 FV3_NML_YAML_CONFIG_FP="${TEMPLATE_DIR}/${FV3_NML_YAML_CONFIG_FN}"
 FV3_NML_BASE_ENS_FP="${EXPTDIR}/${FV3_NML_BASE_ENS_FN}"
 MODEL_CONFIG_TMPL_FP="${TEMPLATE_DIR}/${MODEL_CONFIG_TMPL_FN}"
 NEMS_CONFIG_TMPL_FP="${TEMPLATE_DIR}/${NEMS_CONFIG_TMPL_FN}"
-#
-#-----------------------------------------------------------------------
-#
-# Set:
-#
-# 1) the variable CCPP_PHYS_SUITE_FN to the name of the CCPP physics 
-#    suite definition file.
-# 2) the variable CCPP_PHYS_SUITE_IN_CCPP_FP to the full path of this 
-#    file in the forecast model's directory structure.
-# 3) the variable CCPP_PHYS_SUITE_FP to the full path of this file in 
-#    the experiment directory.
-#
-# Note that the experiment/workflow generation scripts will copy this
-# file from CCPP_PHYS_SUITE_IN_CCPP_FP to CCPP_PHYS_SUITE_FP.  Then, for
-# each cycle, the forecast launch script will create a link in the cycle
-# run directory to the copy of this file at CCPP_PHYS_SUITE_FP.
-#
-#-----------------------------------------------------------------------
-#
-CCPP_PHYS_SUITE_FN="suite_${CCPP_PHYS_SUITE}.xml"
-CCPP_PHYS_SUITE_IN_CCPP_FP="${UFS_WTHR_MDL_DIR}/FV3/ccpp/suites/${CCPP_PHYS_SUITE_FN}"
-CCPP_PHYS_SUITE_FP="${EXPTDIR}/${CCPP_PHYS_SUITE_FN}"
-if [ ! -f "${CCPP_PHYS_SUITE_IN_CCPP_FP}" ]; then
-  print_err_msg_exit "\
-The CCPP suite definition file (CCPP_PHYS_SUITE_IN_CCPP_FP) does not exist
-in the local clone of the ufs-weather-model:
-  CCPP_PHYS_SUITE_IN_CCPP_FP = \"${CCPP_PHYS_SUITE_IN_CCPP_FP}\""
-fi
-#
-#-----------------------------------------------------------------------
-#
-# Call the function that sets the ozone parameterization being used and
-# modifies associated parameters accordingly. 
-#
-#-----------------------------------------------------------------------
-#
-set_ozone_param \
-  ccpp_phys_suite_fp="${CCPP_PHYS_SUITE_IN_CCPP_FP}" \
-  output_varname_ozone_param="OZONE_PARAM"
-#
-#-----------------------------------------------------------------------
-#
-# Set the full paths to those forecast model input files that are cycle-
-# independent, i.e. they don't include information about the cycle's 
-# starting day/time.  These are:
-#
-#   * The data table file [(1) in the list above)]
-#   * The field table file [(3) in the list above)]
-#   * The FV3 namelist file [(4) in the list above)]
-#   * The NEMS configuration file [(6) in the list above)]
-#
-# Since they are cycle-independent, the experiment/workflow generation
-# scripts will place them in the main experiment directory (EXPTDIR).
-# The script that runs each cycle will then create links to these files
-# in the run directories of the individual cycles (which are subdirecto-
-# ries under EXPTDIR).  
-# 
-# The remaining two input files to the forecast model, i.e.
-#
-#   * The diagnostics table file [(2) in the list above)]
-#   * The model configuration file [(5) in the list above)]
-#
-# contain parameters that depend on the cycle start date.  Thus, custom
-# versions of these two files must be generated for each cycle and then
-# placed directly in the run directories of the cycles (not EXPTDIR).
-# For this reason, the full paths to their locations vary by cycle and
-# cannot be set here (i.e. they can only be set in the loop over the 
-# cycles in the rocoto workflow XML file).
-#
-#-----------------------------------------------------------------------
-#
-DATA_TABLE_FP="${EXPTDIR}/${DATA_TABLE_FN}"
-FIELD_TABLE_FP="${EXPTDIR}/${FIELD_TABLE_FN}"
+
+DIAG_TABLE_TMPL_FP=()
+FIELD_TABLE_TMPL_FP=()
+FIELD_TABLE_FP=()
+CCPP_PHYS_SUITE_FP=()
+CCPP_PHYS_SUITE_IN_CCPP_FP=()
+
+for suite in ${SUITES[@]} ; do
+
+  dot_ccpp_phys_suite_or_null=".${suite}"
+  DIAG_TABLE_TMPL_FN="${DIAG_TABLE_FN}${dot_ccpp_phys_suite_or_null}"
+  FIELD_TABLE_TMPL_FN="${FIELD_TABLE_FN}${dot_ccpp_phys_suite_or_null}"
+
+  DIAG_TABLE_TMPL_FP+=("${TEMPLATE_DIR}/${DIAG_TABLE_TMPL_FN}")
+  FIELD_TABLE_TMPL_FP+=("${TEMPLATE_DIR}/${FIELD_TABLE_TMPL_FN}")
+
+  #
+  #-----------------------------------------------------------------------
+  #
+  # Set:
+  #
+  # 1) the variable CCPP_PHYS_SUITE_FN to the name of the CCPP physics 
+  #    suite definition file.
+  # 2) the variable CCPP_PHYS_SUITE_IN_CCPP_FP to the full path of this 
+  #    file in the forecast model's directory structure.
+  # 3) the variable CCPP_PHYS_SUITE_FP to the full path of this file in 
+  #    the experiment directory.
+  #
+  # Note that the experiment/workflow generation scripts will copy this
+  # file from CCPP_PHYS_SUITE_IN_CCPP_FP to CCPP_PHYS_SUITE_FP.  Then, for
+  # each cycle, the forecast launch script will create a link in the cycle
+  # run directory to the copy of this file at CCPP_PHYS_SUITE_FP.
+  #
+  #-----------------------------------------------------------------------
+  #
+  CCPP_PHYS_SUITE_FN="suite_${suite}.xml"
+  CCPP_PHYS_SUITE_IN_CCPP_FP+=("${TEMPLATE_DIR}/suites/${CCPP_PHYS_SUITE_FN}")
+  CCPP_PHYS_SUITE_FP+=("${EXPTDIR}/${CCPP_PHYS_SUITE_FN}")
+  if [ ! -f "${CCPP_PHYS_SUITE_IN_CCPP_FP[-1]}" ]; then
+    print_err_msg_exit "\
+  The CCPP suite definition file (CCPP_PHYS_SUITE_IN_CCPP_FP) does not exist
+  in the local clone of the ufs-weather-model:
+    CCPP_PHYS_SUITE_IN_CCPP_FP = \"${CCPP_PHYS_SUITE_IN_CCPP_FP[-1]}\""
+  fi
+  #
+  #-----------------------------------------------------------------------
+  #
+  # Call the function that sets the ozone parameterization being used and
+  # modifies associated parameters accordingly. 
+  #
+  #-----------------------------------------------------------------------
+  #
+  set_ozone_param \
+    ccpp_phys_suite_fp="${CCPP_PHYS_SUITE_IN_CCPP_FP[-1]}" \
+    output_varname_ozone_param="OZONE_PARAM"
+  #
+  #-----------------------------------------------------------------------
+  #
+  # Set the name of the file containing aerosol climatology data that, if
+  # necessary, can be used to generate approximate versions of the aerosol 
+  # fields needed by Thompson microphysics.  This file will be used to 
+  # generate such approximate aerosol fields in the ICs and LBCs if
+  # Thompson 
+  # MP is included in the physics suite and if the exteranl model for ICs
+  # or LBCs does not already provide these fields.  Also, set the full
+  # path
+  # to this file.
+  #
+  #-----------------------------------------------------------------------
+  #
+  THOMPSON_MP_CLIMO_FN="Thompson_MP_MONTHLY_CLIMO.nc"
+  THOMPSON_MP_CLIMO_FP="$FIXam/${THOMPSON_MP_CLIMO_FN}"
+  #
+  #-----------------------------------------------------------------------
+  #
+  # Call the function that, if the Thompson microphysics parameterization
+  # is being called by the physics suite, modifies certain workflow arrays
+  # to ensure that fixed files needed by this parameterization are copied
+  # to the FIXam directory and appropriate symlinks to them are created in
+  # the run directories.  This function also sets the workflow variable
+  # THOMPSON_MP_USED that indicates whether Thompson MP is called by the
+  # physics suite.
+  #
+  #-----------------------------------------------------------------------
+  #
+  set_thompson_mp_fix_files \
+    ccpp_phys_suite_fp="${CCPP_PHYS_SUITE_IN_CCPP_FP[-1]}" \
+    thompson_mp_climo_fn="${THOMPSON_MP_CLIMO_FN}" \
+    output_varname_thompson_mp_used="THOMPSON_MP_USED"
+  #
+  #-----------------------------------------------------------------------
+  #
+  # Set the full paths to those forecast model input files that are cycle-
+  # independent, i.e. they don't include information about the cycle's 
+  # starting day/time.  These are:
+  #
+  #   * The data table file [(1) in the list above)]
+  #   * The field table file [(3) in the list above)]
+  #   * The FV3 namelist file [(4) in the list above)]
+  #   * The NEMS configuration file [(6) in the list above)]
+  #
+  # Since they are cycle-independent, the experiment/workflow generation
+  # scripts will place them in the main experiment directory (EXPTDIR).
+  # The script that runs each cycle will then create links to these files
+  # in the run directories of the individual cycles (which are subdirecto-
+  # ries under EXPTDIR).  
+  # 
+  # The remaining two input files to the forecast model, i.e.
+  #
+  #   * The diagnostics table file [(2) in the list above)]
+  #   * The model configuration file [(5) in the list above)]
+  #
+  # contain parameters that depend on the cycle start date.  Thus, custom
+  # versions of these two files must be generated for each cycle and then
+  # placed directly in the run directories of the cycles (not EXPTDIR).
+  # For this reason, the full paths to their locations vary by cycle and
+  # cannot be set here (i.e. they can only be set in the loop over the 
+  # cycles in the rocoto workflow XML file).
+  #
+  #-----------------------------------------------------------------------
+  #
+  DATA_TABLE_FP="${EXPTDIR}/${DATA_TABLE_FN}"
+  FIELD_TABLE_FP+=("${EXPTDIR}/${FIELD_TABLE_TMPL_FN}")
+done
+
 FV3_NML_FN="${FV3_NML_BASE_SUITE_FN%.*}"
 FV3_NML_FP="${EXPTDIR}/${FV3_NML_FN}"
 NEMS_CONFIG_FP="${EXPTDIR}/${NEMS_CONFIG_FN}"
@@ -2074,40 +2105,6 @@ fi
 #
 NNODES_RUN_FCST=$(( (PE_MEMBER01 + PPN_RUN_FCST - 1)/PPN_RUN_FCST ))
 
-#
-#-----------------------------------------------------------------------
-#
-# Set the name of the file containing aerosol climatology data that, if
-# necessary, can be used to generate approximate versions of the aerosol 
-# fields needed by Thompson microphysics.  This file will be used to 
-# generate such approximate aerosol fields in the ICs and LBCs if
-# Thompson 
-# MP is included in the physics suite and if the exteranl model for ICs
-# or LBCs does not already provide these fields.  Also, set the full
-# path
-# to this file.
-#
-#-----------------------------------------------------------------------
-#
-THOMPSON_MP_CLIMO_FN="Thompson_MP_MONTHLY_CLIMO.nc"
-THOMPSON_MP_CLIMO_FP="$FIXam/${THOMPSON_MP_CLIMO_FN}"
-#
-#-----------------------------------------------------------------------
-#
-# Call the function that, if the Thompson microphysics parameterization
-# is being called by the physics suite, modifies certain workflow arrays
-# to ensure that fixed files needed by this parameterization are copied
-# to the FIXam directory and appropriate symlinks to them are created in
-# the run directories.  This function also sets the workflow variable
-# THOMPSON_MP_USED that indicates whether Thompson MP is called by the
-# physics suite.
-#
-#-----------------------------------------------------------------------
-#
-set_thompson_mp_fix_files \
-  ccpp_phys_suite_fp="${CCPP_PHYS_SUITE_IN_CCPP_FP}" \
-  thompson_mp_climo_fn="${THOMPSON_MP_CLIMO_FN}" \
-  output_varname_thompson_mp_used="THOMPSON_MP_USED"
 #
 #-----------------------------------------------------------------------
 #
@@ -2438,7 +2435,6 @@ UFS_WTHR_MDL_DIR="${UFS_WTHR_MDL_DIR}"
 UFS_UTILS_DIR="${UFS_UTILS_DIR}"
 SFC_CLIMO_INPUT_DIR="${SFC_CLIMO_INPUT_DIR}"
 TOPO_DIR="${TOPO_DIR}"
-EMC_POST_DIR="${EMC_POST_DIR}"
 
 EXPTDIR="$EXPTDIR"
 LOGDIR="$LOGDIR"
@@ -2469,8 +2465,8 @@ MODEL_CONFIG_TMPL_FN="${MODEL_CONFIG_TMPL_FN}"
 NEMS_CONFIG_TMPL_FN="${NEMS_CONFIG_TMPL_FN}"
 
 DATA_TABLE_TMPL_FP="${DATA_TABLE_TMPL_FP}"
-DIAG_TABLE_TMPL_FP="${DIAG_TABLE_TMPL_FP}"
-FIELD_TABLE_TMPL_FP="${FIELD_TABLE_TMPL_FP}"
+DIAG_TABLE_TMPL_FP=( $( printf "\"%s\" " "${DIAG_TABLE_TMPL_FP[@]}" ))
+FIELD_TABLE_TMPL_FP=( $( printf "\"%s\" " "${FIELD_TABLE_TMPL_FP[@]}" ))
 FV3_NML_BASE_SUITE_FP="${FV3_NML_BASE_SUITE_FP}"
 FV3_NML_YAML_CONFIG_FP="${FV3_NML_YAML_CONFIG_FP}"
 FV3_NML_BASE_ENS_FP="${FV3_NML_BASE_ENS_FP}"
@@ -2478,11 +2474,11 @@ MODEL_CONFIG_TMPL_FP="${MODEL_CONFIG_TMPL_FP}"
 NEMS_CONFIG_TMPL_FP="${NEMS_CONFIG_TMPL_FP}"
 
 CCPP_PHYS_SUITE_FN="${CCPP_PHYS_SUITE_FN}"
-CCPP_PHYS_SUITE_IN_CCPP_FP="${CCPP_PHYS_SUITE_IN_CCPP_FP}"
-CCPP_PHYS_SUITE_FP="${CCPP_PHYS_SUITE_FP}"
+CCPP_PHYS_SUITE_IN_CCPP_FP=( $( printf "\"%s\" " "${CCPP_PHYS_SUITE_IN_CCPP_FP[@]}" ))
+CCPP_PHYS_SUITE_FP=( $( printf "\"%s\" " "${CCPP_PHYS_SUITE_FP[@]}" ))
 
 DATA_TABLE_FP="${DATA_TABLE_FP}"
-FIELD_TABLE_FP="${FIELD_TABLE_FP}"
+FIELD_TABLE_FP=( $( printf "\"%s\" " "${FIELD_TABLE_FP[@]}" ))
 FV3_NML_FN="${FV3_NML_FN}"   # This may not be necessary...
 FV3_NML_FP="${FV3_NML_FP}"
 NEMS_CONFIG_FP="${NEMS_CONFIG_FP}"
diff --git a/ush/templates/FV3.input.yml b/ush/templates/FV3.input.yml
index ac27188b7..c0cce3bf9 100644
--- a/ush/templates/FV3.input.yml
+++ b/ush/templates/FV3.input.yml
@@ -282,6 +282,55 @@ FV3_GFS_v15p2:
     ldebug: False
   surf_map_nml:
 
+FV3_GFS_v15_thompson_mynn:
+  atmos_model_nml:
+    avg_max_length: 3600.0
+    ccpp_suite: FV3_GFS_v15_thompson_mynn
+  fms_nml:
+    domains_stack_size: 3000000
+  fv_core_nml:
+    agrid_vel_rst: True
+    full_zs_filter: !!python/none
+    k_split: 2
+    n_split: 7
+    n_sponge: 9
+    nord_zs_filter: !!python/none
+    rf_fast: False
+    stretch_fac: 0.999
+  gfs_physics_nml:
+    avg_max_length: 3600.0
+    cdmbgwd: [0.88, 0.04]
+    do_ugwp: False
+    do_deep: False
+    do_tofd: False
+    effr_in: True
+    fhlwr: 900.
+    fhswr: 900.
+    imfshalcnv: 2
+    imfdeepcnv: 2
+    iopt_alb: 2
+    iopt_btr: 1
+    iopt_crs: 1
+    iopt_dveg: 2
+    iopt_frz: 1
+    iopt_inf: 1
+    iopt_rad: 1
+    iopt_run: 1
+    iopt_sfc: 1
+    iopt_snf: 4
+    iopt_stc: 1
+    iopt_tbot: 2
+    ldiag_ugwp: False
+    lgfdlmprad: False
+    lsm: 1
+    lsoil: !!python/none
+    lsoil_lsm: !!python/none
+    ltaerosol: False
+    nstf_name: [0, 0, 0, 0, 0]
+    xkzm_h: 1.0
+    xkzm_m: 1.0
+    xkzminv: 0.3
+
 FV3_GFS_v16beta:
   atmos_model_nml:
     ccpp_suite: FV3_GFS_v16
@@ -449,3 +498,112 @@ FV3_CPT_v0:
     xkzm_s: 1.0
   surf_map_nml: !!python/none
 
+rrfs_gfsv16:
+  atmos_model_nml:
+    avg_max_length: 3600.0
+    blocksize: 29
+    ccpp_suite: rrfs_gfsv16
+    fdiag: 3
+  fv_core_nml:
+    agrid_vel_rst: True
+    dnats: 1
+    do_sat_adj: True
+    full_zs_filter: !!python/none
+    k_split: 3
+    n_split: 4
+    n_sponge: 9
+    rf_fast: False
+    sg_cutoff: 10000.0
+    stretch_fac: 0.999
+    write_restart_with_bcs: False
+  gfdl_cloud_microphysics_nml:
+    ccn_l: 300.0
+    ccn_o: 100.0
+    c_cracw: 0.8
+    const_vg: False
+    const_vi: False
+    const_vr: False
+    const_vs: False
+    c_paut: 0.5
+    c_pgacs: 0.01
+    c_psaci: 0.05
+    de_ice: False
+    do_qa: True
+    do_sedi_heat: False
+    dw_land: 0.16
+    dw_ocean: 0.1
+    fast_sat_adj: True
+    fix_negative: True
+    icloud_f: 1
+    mono_prof: True
+    mp_time: 150.0
+    prog_ccn: False
+    qi0_crt: 8.0e-05
+    qi_lim: 1.0
+    ql_gen: 0.001
+    ql_mlt: 0.001
+    qs0_crt: 0.001
+    rad_graupel: True
+    rad_rain: True
+    rad_snow: True
+    reiflag: 2
+    rh_inc: 0.3
+    rh_inr: 0.3
+    rh_ins: 0.3
+    rthresh: 1.0e-05
+    sedi_transport: True
+    tau_g2v: 900.0
+    tau_i2s: 1000.0
+    tau_l2v: 225.0
+    tau_v2l: 150.0
+    use_ccn: True
+    use_ppm: False
+    vg_max: 12.0
+    vi_max: 1.0
+    vr_max: 12.0
+    vs_max: 2.0
+    z_slope_ice: True
+    z_slope_liq: True
+  gfs_physics_nml:
+    avg_max_length: 3600.0
+    bl_mynn_edmf_mom: !!python/none
+    bl_mynn_edmf: !!python/none
+    bl_mynn_tkeadvect: !!python/none
+    cdmbgwd:  [0.88, 0.04]
+    do_deep:  False
+    do_mynnedmf:  False
+    do_tofd:  False
+    do_ugwp:  False
+    effr_in:  True
+    fhlwr:  900.0
+    fhswr:  900.0
+    iaer:  5111
+    icliq_sw:  2
+    imfdeepcnv:  2
+    imfshalcnv:  2
+    imp_physics:  11
+    iopt_alb:  2
+    iopt_btr:  1
+    iopt_crs:  1
+    iopt_dveg:  2
+    iopt_frz:  1
+    iopt_inf:  1
+    iopt_rad:  1
+    iopt_run:  1
+    iopt_sfc:  1
+    iopt_snf:  4
+    iopt_stc:  1
+    iopt_tbot:  2
+    iovr:  3
+    isatmedmf:  1
+    ldiag_ugwp:  False
+    lgfdlmprad:  True
+    lheatstrg:  False
+    lsm:  1
+    lsoil_lsm: !!python/none
+    ltaerosol:  False
+    nstf_name:  [0, 0, 0, 0, 0]
+    satmedmf:  True
+    xkzm_h:  1.0
+    xkzminv:  0.3
+    xkzm_m:  1.0
diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml
index 567ef040a..b7ebca3fa 100644
--- a/ush/templates/FV3LAM_wflow.xml
+++ b/ush/templates/FV3LAM_wflow.xml
@@ -408,42 +408,6 @@ MODULES_RUN_TASK_FP script.
 ************************************************************************
 ************************************************************************
 -->
-  <metatask name="&RUN_POST_TN;{{ uscore_ensmem_name }}">
-
-    <var name="fhr"> {% for h in range(0, fcst_len_hrs+1) %}{{ " %03d" % h  }}{% endfor %} </var>
-
-    <task name="&RUN_POST_TN;{{ uscore_ensmem_name }}_f#fhr#" maxtries="{{ maxtries_run_post }}">
-
-      &RSRV_DEFAULT;
-      <command>&LOAD_MODULES_RUN_TASK_FP; "&RUN_POST_TN;" "&JOBSDIR;/JREGIONAL_RUN_POST"</command>
-      <nodes>{{ nnodes_run_post }}:ppn={{ ppn_run_post }}</nodes>
-      <exclusive/>
-      <walltime>{{ wtime_run_post }}</walltime>
-      <nodesize>&NCORES_PER_NODE;</nodesize>
-      <jobname>&RUN_POST_TN;{{ uscore_ensmem_name }}_f#fhr#</jobname>
-      <join><cyclestr>&LOGDIR;/&RUN_POST_TN;{{ uscore_ensmem_name }}_f#fhr#_@Y@m@d@H.log</cyclestr></join>
-
-      <envar><name>GLOBAL_VAR_DEFNS_FP</name><value>&GLOBAL_VAR_DEFNS_FP;</value></envar>
-      <envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
-      <envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
-      <envar><name>CYCLE_DIR</name><value><cyclestr>&CYCLE_BASEDIR;/@Y@m@d@H</cyclestr></value></envar>
-      <envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>
-      <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
-      <envar><name>fhr</name><value>#fhr#</value></envar>
-
-      <dependency>
-        <or>
-          <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
-          <and>
-            <datadep age="05:00"><cyclestr>&CYCLE_BASEDIR;/@Y@m@d@H{{ slash_ensmem_subdir }}/dynf#fhr#.nc</cyclestr></datadep>
-            <datadep age="05:00"><cyclestr>&CYCLE_BASEDIR;/@Y@m@d@H{{ slash_ensmem_subdir }}/phyf#fhr#.nc</cyclestr></datadep>
-          </and>
-        </or>
-      </dependency>
-
-    </task>
-
-  </metatask>
 
 {% if do_ensemble %}
   </metatask>
diff --git a/ush/templates/diag_table.FV3_GFS_v15_thompson_mynn b/ush/templates/diag_table.FV3_GFS_v15_thompson_mynn
new file mode 100644
index 000000000..aab8b8243
--- /dev/null
+++ b/ush/templates/diag_table.FV3_GFS_v15_thompson_mynn
@@ -0,0 +1,338 @@
+20201123.00Z.C3357.32bit.non-hydro
+2021 03 17 00 0 0
+#output files
+"grid_spec",              -1,  "months",   1, "days",  "time"
+"atmos_static",           -1,  "hours",    1, "hours", "time"
+#"atmos_4xdaily",           6,  "hours",    1, "days",  "time"
+"fv3_history",             3,  "hours",    1, "hours", "time"
+"fv3_history2d",           3,  "hours",    1, "hours", "time"
+
+#
+#=======================
+# ATMOSPHERE DIAGNOSTICS
+#=======================
+###
+# grid_spec
+###
+ "dynamics", "grid_lon", "grid_lon", "grid_spec", "all", .false.,  "none", 2,
+ "dynamics", "grid_lat", "grid_lat", "grid_spec", "all", .false.,  "none", 2,
+ "dynamics", "grid_lont", "grid_lont", "grid_spec", "all", .false.,  "none", 2,
+ "dynamics", "grid_latt", "grid_latt", "grid_spec", "all", .false.,  "none", 2,
+ "dynamics", "area",     "area",     "grid_spec", "all", .false.,  "none", 2,
+###
+# 4x daily output
+###
+# "dynamics",  "slp",         "slp",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "vort850",     "vort850",    "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "vort200",     "vort200",    "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "us",          "us",         "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u1000",       "u1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u850",        "u850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u700",        "u700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u500",        "u500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u200",        "u200",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u100",        "u100",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u50",         "u50",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u10",         "u10",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "vs",          "vs",         "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v1000",       "v1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v850",        "v850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v700",        "v700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v500",        "v500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v200",        "v200",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v100",        "v100",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v50",         "v50",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v10",         "v10",        "atmos_4xdaily", "all", .false.,  "none", 2
+####
+# "dynamics",  "tm",          "tm",         "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t1000",       "t1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t850",        "t850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t700",        "t700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t500",        "t500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t200",        "t200",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t100",        "t100",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t50",         "t50",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t10",         "t10",        "atmos_4xdaily", "all", .false.,  "none", 2
+####
+# "dynamics",  "z1000",       "z1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "z850",        "z850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "z700",        "z700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "z500",        "z500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "z200",        "z200",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "z100",        "z100",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "z50",         "z50",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "z10",         "z10",        "atmos_4xdaily", "all", .false.,  "none", 2
+####
+#"dynamics",  "w1000",       "w1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "w850",        "w850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "w700",        "w700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "w500",        "w500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "w200",        "w200",       "atmos_4xdaily", "all", .false.,  "none", 2
+####
+# "dynamics",  "q1000",       "q1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q850",        "q850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q700",        "q700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q500",        "q500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q200",        "q200",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q100",        "q100",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q50",         "q50",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q10",         "q10",        "atmos_4xdaily", "all", .false.,  "none", 2
+####
+# "dynamics",  "rh1000",      "rh1000",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "rh850",       "rh850",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "rh700",       "rh700",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "rh500",       "rh500",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "rh200",       "rh200",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg1000",     "omg1000",    "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg850",      "omg850",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg700",      "omg700",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg500",      "omg500",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg200",      "omg200",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg100",      "omg100",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg50",       "omg50",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg10",       "omg10",      "atmos_4xdaily", "all", .false.,  "none", 2
+###
+# gfs static data
+###
+ "dynamics",      "pk",          "pk",           "atmos_static",      "all", .false.,  "none", 2
+ "dynamics",      "bk",          "bk",           "atmos_static",      "all", .false.,  "none", 2
+ "dynamics",      "hyam",        "hyam",         "atmos_static",      "all", .false.,  "none", 2
+ "dynamics",      "hybm",        "hybm",         "atmos_static",      "all", .false.,  "none", 2
+ "dynamics",      "zsurf",       "zsurf",        "atmos_static",      "all", .false.,  "none", 2
+###
+# FV3 variabls needed for NGGPS evaluation
+###
+"gfs_dyn",     "ucomp",       "ugrd",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "vcomp",       "vgrd",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "sphum",       "spfh",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "temp",        "tmp",       "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "liq_wat",     "clwmr",     "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "o3mr",        "o3mr",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "delp",        "dpres",     "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "delz",        "delz",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "w",           "dzdt",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "ice_wat",     "icmr",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "rainwat",     "rwmr",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "snowwat",     "snmr",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "graupel",     "grle",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "q_rimef",     "q_rimef",   "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "ps",          "pressfc",   "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "hs",          "hgtsfc",    "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "pfnh",        "pfnh",      "fv3_history",    "all",  .false.,  "none",  2
+#"gfs_dyn",     "ice_nc",      "nicp",      "fv3_history",  "all",  .false.,  "none",  2
+#"gfs_dyn",     "rain_nc",     "ntrnc",     "fv3_history",  "all",  .false.,  "none",  2
+#"gfs_dyn",     "cld_amt",     "cld_amt",    "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "wmaxup",      "upvvelmax",    "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "wmaxdn",      "dnvvelmax",    "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "uhmax03",     "uhmax03",    "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "uhmax25",     "uhmax25",    "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "uhmin03",     "uhmin03",    "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "uhmin25",     "uhmin25",    "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "maxvort01",   "maxvort01",   "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "maxvort02",   "maxvort02",   "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "maxvorthy1",  "maxvorthy1", "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "ustm",        "ustm",       "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "vstm",        "vstm",       "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "srh01",        "srh01",       "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "srh03",        "srh03",       "fv3_history",    "all",  .false.,  "none",  2
+"gfs_phys",    "u10max",     "u10max",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "v10max",     "v10max",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "spd10max",   "spd10max",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "refdmax",    "refdmax",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "refdmax263k","refdmax263k","fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "t02max",     "t02max",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "t02min",     "t02min",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "rh02max",    "rh02max",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "rh02min",    "rh02min",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "refl_10cm",  "refl_10cm",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cldfra",     "cldfra",     "fv3_history2d",  "all",  .false.,  "none",  2
+
+"gfs_phys",  "ALBDO_ave",     "albdo_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "cnvprcp_ave",   "cprat_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "cnvprcpb_ave",  "cpratb_ave",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "totprcp_ave",   "prate_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "totprcpb_ave",  "prateb_ave",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "DLWRF",         "dlwrf_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "DLWRFI",        "dlwrf",       "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "ULWRF",         "ulwrf_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "ULWRFI",        "ulwrf",       "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "DSWRF",         "dswrf_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "DSWRFI",        "dswrf",       "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "USWRF",         "uswrf_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "USWRFI",        "uswrf",       "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "DSWRFtoa",      "dswrf_avetoa","fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "USWRFtoa",      "uswrf_avetoa","fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "ULWRFtoa",      "ulwrf_avetoa","fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "gflux_ave",     "gflux_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "hpbl",          "hpbl",        "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "lhtfl_ave",     "lhtfl_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "shtfl_ave",     "shtfl_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "pwat",          "pwatclm",     "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "soilm",         "soilm",       "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDC_aveclm",   "tcdc_aveclm", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDC_avebndcl", "tcdc_avebndcl",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDC_avehcl",   "tcdc_avehcl", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDC_avelcl",   "tcdc_avelcl", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDC_avemcl",   "tcdc_avemcl", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDCcnvcl",     "tcdccnvcl",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PREScnvclt",    "prescnvclt",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PREScnvclb",    "prescnvclb",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avehct",   "pres_avehct", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avehcb",   "pres_avehcb", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TEMP_avehct",   "tmp_avehct",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avemct",   "pres_avemct", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avemcb",   "pres_avemcb", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TEMP_avemct",   "tmp_avemct",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avelct",   "pres_avelct", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avelcb",   "pres_avelcb", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TEMP_avelct",   "tmp_avelct",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "u-gwd_ave",     "u-gwd_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "v-gwd_ave",     "v-gwd_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "dusfc",         "uflx_ave",    "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "dvsfc",         "vflx_ave",    "fv3_history2d",         "all",  .false.,  "none",  2
+#"gfs_phys",  "cnvw",          "cnvcldwat",   "fv3_history2d",         "all",  .false.,  "none",  2
+
+"gfs_phys",    "psurf",       "pressfc",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "u10m",        "ugrd10m",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "v10m",        "vgrd10m",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "crain",       "crain",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tprcp",       "tprcp",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "hgtsfc",      "orog",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "weasd",       "weasd",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "f10m",        "f10m",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "q2m",         "spfh2m",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "t2m",         "tmp2m",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tsfc",        "tmpsfc",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "vtype",       "vtype",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "stype",       "sotyp",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slmsksfc",    "land",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "vfracsfc",    "veg",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "zorlsfc",     "sfcr",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "uustar",      "fricv",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt1",      "soilt1"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt2",      "soilt2"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt3",      "soilt3"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt4",      "soilt4"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw1",      "soilw1"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw2",      "soilw2"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw3",      "soilw3"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw4",      "soilw4"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_1",       "soill1",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_2",       "soill2",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_3",       "soill3",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_4",       "soill4",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slope",       "sltyp",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alnsf",       "alnsf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alnwf",       "alnwf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alvsf",       "alvsf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alvwf",       "alvwf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "canopy",      "cnwat",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "facsf",       "facsf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "facwf",       "facwf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "ffhh",        "ffhh",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "ffmm",        "ffmm",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "fice",        "icec",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "hice",        "icetk",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "snoalb",      "snoalb",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "shdmax",      "shdmax",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "shdmin",      "shdmin",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "snowd",       "snod",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tg3",         "tg3",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tisfc",       "tisfc",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tref",        "tref",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "z_c",         "zc",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "c_0",         "c0",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "c_d",         "cd",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "w_0",         "w0",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "w_d",         "wd",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xt",          "xt",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xz",          "xz",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "dt_cool",     "dtcool",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xs",          "xs",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xu",          "xu",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xv",          "xv",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xtts",        "xtts",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xzts",        "xzts",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "d_conv",      "dconv",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "qrain",       "qrain",     "fv3_history2d",  "all",  .false.,  "none",  2
+
+"gfs_phys",    "acond",        "acond",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cduvb_ave",    "cduvb_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cpofp",        "cpofp",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "duvb_ave",     "duvb_ave",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csdlf_ave",    "csdlf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csusf_ave",    "csusf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csusf_avetoa", "csusftoa",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csdsf_ave",    "csdsf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csulf_ave",    "csulf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csulf_avetoa", "csulftoa",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cwork_ave",    "cwork_aveclm",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "evbs_ave",     "evbs_ave",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "evcw_ave",     "evcw_ave",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "fldcp",        "fldcp",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "hgt_hyblev1",  "hgt_hyblev1",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "spfh_hyblev1", "spfh_hyblev1",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ugrd_hyblev1", "ugrd_hyblev1",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "vgrd_hyblev1", "vgrd_hyblev1",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tmp_hyblev1",  "tmp_hyblev1",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "gfluxi",       "gflux",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "lhtfl",        "lhtfl",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "shtfl",        "shtfl",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "pevpr",        "pevpr",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "pevpr_ave",    "pevpr_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "sbsno_ave",    "sbsno_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "sfexc",        "sfexc",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "snohf",        "snohf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "snowc_ave",    "snowc_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "spfhmax2m",    "spfhmax_max2m", "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "spfhmin2m",    "spfhmin_min2m", "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tmpmax2m",     "tmax_max2m",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tmpmin2m",     "tmin_min2m",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ssrun_acc",    "ssrun_acc",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "sunsd_acc",    "sunsd_acc",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "watr_acc",     "watr_acc",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "wilt",         "wilt",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "vbdsf_ave",    "vbdsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "vddsf_ave",    "vddsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "nbdsf_ave",    "nbdsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "nddsf_ave",    "nddsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "trans_ave",    "trans_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+# Aerosols (CCN, IN) from Thompson microphysics
+"gfs_phys",    "nwfa",         "nwfa",          "fv3_history",    "all",  .false.,  "none",  2
+"gfs_phys",    "nifa",         "nifa",          "fv3_history",    "all",  .false.,  "none",  2
+"gfs_sfc",     "nwfa2d",       "nwfa2d",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "nifa2d",       "nifa2d",        "fv3_history2d",  "all",  .false.,  "none",  2
+
+#=============================================================================================
+#
+#====> This file can be used with diag_manager/v2.0a (or higher) <====
+#
+#
+#  FORMATS FOR FILE ENTRIES (not all input values are used)
+#  ------------------------
+#
+#"file_name", output_freq, "output_units", format, "time_units", "long_name",
+#
+#
+#output_freq:  > 0  output frequency in "output_units"
+#              = 0  output frequency every time step
+#              =-1  output frequency at end of run
+#
+#output_units = units used for output frequency
+#               (years, months, days, minutes, hours, seconds)
+#
+#time_units   = units used to label the time axis
+#               (days, minutes, hours, seconds)
+#
+#
+#  FORMAT FOR FIELD ENTRIES (not all input values are used)
+#  ------------------------
+#
+#"module_name", "field_name", "output_name", "file_name" "time_sampling", time_avg, "other_opts", packing
+#
+#time_avg = .true. or .false.
+#
+#packing  = 1  double precision
+#         = 2  float
+#         = 4  packed 16-bit integers
+#         = 8  packed 1-byte (not tested?)
diff --git a/ush/templates/diag_table.rrfs_gfsv16 b/ush/templates/diag_table.rrfs_gfsv16
new file mode 100644
index 000000000..1d522ab36
--- /dev/null
+++ b/ush/templates/diag_table.rrfs_gfsv16
@@ -0,0 +1,319 @@
+20190719.18Z.C3357.32bit.non-hydro.regional
+2019 07 19 18 00 00
+
+"grid_spec",              -1,  "months",   1, "days",  "time"
+#"atmos_4xdaily",           6,  "hours",    1, "days",  "time"
+"atmos_static",           -1,  "hours",    1, "hours", "time"
+"fv3_history",    0,  "hours",  1,  "hours",  "time"
+"fv3_history2d",  0,  "hours",  1,  "hours",  "time"
+
+#
+#=======================
+# ATMOSPHERE DIAGNOSTICS
+#=======================
+###
+# grid_spec
+###
+ "dynamics", "grid_lon", "grid_lon", "grid_spec", "all", .false.,  "none", 2,
+ "dynamics", "grid_lat", "grid_lat", "grid_spec", "all", .false.,  "none", 2,
+ "dynamics", "grid_lont", "grid_lont", "grid_spec", "all", .false.,  "none", 2,
+ "dynamics", "grid_latt", "grid_latt", "grid_spec", "all", .false.,  "none", 2,
+ "dynamics", "area",     "area",     "grid_spec", "all", .false.,  "none", 2,
+###
+# 4x daily output
+###
+# "dynamics",  "slp",         "slp",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "vort850",     "vort850",    "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "vort200",     "vort200",    "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "us",          "us",         "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u1000",       "u1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u850",        "u850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u700",        "u700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u500",        "u500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u200",        "u200",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u100",        "u100",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u50",         "u50",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "u10",         "u10",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "vs",          "vs",         "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v1000",       "v1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v850",        "v850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v700",        "v700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v500",        "v500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v200",        "v200",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v100",        "v100",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v50",         "v50",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "v10",         "v10",        "atmos_4xdaily", "all", .false.,  "none", 2
+####
+# "dynamics",  "tm",          "tm",         "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t1000",       "t1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t850",        "t850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t700",        "t700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t500",        "t500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t200",        "t200",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t100",        "t100",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t50",         "t50",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "t10",         "t10",        "atmos_4xdaily", "all", .false.,  "none", 2
+####
+# "dynamics",  "h1000",       "h1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "h850",        "h850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "h700",        "h700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "h500",        "h500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "h200",        "h200",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "h100",        "h100",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "h50",         "h50",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "h10",         "h10",        "atmos_4xdaily", "all", .false.,  "none", 2
+####
+# "dynamics",  "w1000",       "w1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "w850",        "w850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "w700",        "w700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "w500",        "w500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "w200",        "w200",       "atmos_4xdaily", "all", .false.,  "none", 2
+####
+# "dynamics",  "q1000",       "q1000",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q850",        "q850",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q700",        "q700",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q500",        "q500",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q200",        "q200",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q100",        "q100",       "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q50",         "q50",        "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "q10",         "q10",        "atmos_4xdaily", "all", .false.,  "none", 2
+####
+# "dynamics",  "rh1000",      "rh1000",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "rh850",       "rh850",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "rh700",       "rh700",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "rh500",       "rh500",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "rh200",       "rh200",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg1000",     "omg1000",    "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg850",      "omg850",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg700",      "omg700",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg500",      "omg500",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg200",      "omg200",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg100",      "omg100",     "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg50",       "omg50",      "atmos_4xdaily", "all", .false.,  "none", 2
+# "dynamics",  "omg10",       "omg10",      "atmos_4xdaily", "all", .false.,  "none", 2
+###
+# gfs static data
+###
+ "dynamics",      "pk",          "pk",           "atmos_static",      "all", .false.,  "none", 2
+ "dynamics",      "bk",          "bk",           "atmos_static",      "all", .false.,  "none", 2
+ "dynamics",      "hyam",        "hyam",         "atmos_static",      "all", .false.,  "none", 2
+ "dynamics",      "hybm",        "hybm",         "atmos_static",      "all", .false.,  "none", 2
+ "dynamics",      "zsurf",       "zsurf",        "atmos_static",      "all", .false.,  "none", 2
+###
+# FV3 variabls needed for NGGPS evaluation
+###
+"gfs_dyn",     "ucomp",       "ugrd",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "vcomp",       "vgrd",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "sphum",       "spfh",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "temp",        "tmp",       "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "liq_wat",     "clwmr",     "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "o3mr",        "o3mr",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "delp",        "dpres",     "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "delz",        "delz",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "w",           "dzdt",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "ice_wat",     "icmr",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "rainwat",     "rwmr",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "snowwat",     "snmr",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "graupel",     "grle",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "ps",          "pressfc",   "fv3_history",    "all",  .false.,  "none",  2
+"gfs_dyn",     "hs",          "hgtsfc",    "fv3_history",    "all",  .false.,  "none",  2
+"gfs_phys",    "refl_10cm"    "refl_10cm"  "fv3_history",    "all",  .false.,  "none",  2
+#"gfs_dyn",     "ice_nc",      "nicp",      "fv3_history",  "all",  .false.,  "none",  2
+#"gfs_dyn",     "rain_nc",     "ntrnc",     "fv3_history",  "all",  .false.,  "none",  2
+#
+"gfs_dyn",   "wmaxup",        "upvvelmax",   "fv3_history",           "all",  .false.,  "none", 2
+"gfs_dyn",   "wmaxdn",        "dnvvelmax",   "fv3_history",           "all",  .false.,  "none", 2
+"gfs_dyn",   "uhmax03",       "uhmax03",     "fv3_history",           "all",  .false.,  "none", 2
+"gfs_dyn",   "uhmax25",       "uhmax25",     "fv3_history",           "all",  .false.,  "none", 2
+"gfs_dyn",   "uhmin03",       "uhmin03",     "fv3_history",           "all",  .false.,  "none", 2
+"gfs_dyn",   "uhmin25",       "uhmin25",     "fv3_history",           "all",  .false.,  "none", 2
+"gfs_dyn",   "maxvort01",     "maxvort01",   "fv3_history",           "all",  .false.,  "none", 2
+"gfs_dyn",   "maxvort02",     "maxvort02",   "fv3_history",           "all",  .false.,  "none", 2
+"gfs_dyn",   "maxvorthy1",    "maxvorthy1",  "fv3_history",           "all",  .false.,  "none", 2
+#
+
+"gfs_phys",  "ALBDO_ave",     "albdo_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "cnvprcp_ave",   "cprat_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "cnvprcpb_ave",  "cpratb_ave",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "totprcp_ave",   "prate_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "totprcpb_ave",  "prateb_ave",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "DLWRF",         "dlwrf_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "DLWRFI",        "dlwrf",       "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "ULWRF",         "ulwrf_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "ULWRFI",        "ulwrf",       "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "DSWRF",         "dswrf_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "DSWRFI",        "dswrf",       "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "USWRF",         "uswrf_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "USWRFI",        "uswrf",       "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "DSWRFtoa",      "dswrf_avetoa","fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "USWRFtoa",      "uswrf_avetoa","fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "ULWRFtoa",      "ulwrf_avetoa","fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "gflux_ave",     "gflux_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "hpbl",          "hpbl",        "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "lhtfl_ave",     "lhtfl_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "shtfl_ave",     "shtfl_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "pwat",          "pwatclm",     "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "soilm",         "soilm",       "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDC_aveclm",   "tcdc_aveclm", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDC_avebndcl", "tcdc_avebndcl",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDC_avehcl",   "tcdc_avehcl", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDC_avelcl",   "tcdc_avelcl", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDC_avemcl",   "tcdc_avemcl", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TCDCcnvcl",     "tcdccnvcl",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PREScnvclt",    "prescnvclt",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PREScnvclb",    "prescnvclb",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avehct",   "pres_avehct", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avehcb",   "pres_avehcb", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TEMP_avehct",   "tmp_avehct",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avemct",   "pres_avemct", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avemcb",   "pres_avemcb", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TEMP_avemct",   "tmp_avemct",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avelct",   "pres_avelct", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "PRES_avelcb",   "pres_avelcb", "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "TEMP_avelct",   "tmp_avelct",  "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "u-gwd_ave",     "u-gwd_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "v-gwd_ave",     "v-gwd_ave",   "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "dusfc",         "uflx_ave",    "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "dvsfc",         "vflx_ave",    "fv3_history2d",         "all",  .false.,  "none",  2
+"gfs_phys",  "cldfra",        "cldfra",      "fv3_history2d",         "all",  .false.,  "none",  2
+#"gfs_phys",  "cnvw",          "cnvcldwat",   "fv3_history2d",         "all",  .false.,  "none",  2
+
+"gfs_phys",    "psurf",       "pressfc",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "u10m",        "ugrd10m",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "v10m",        "vgrd10m",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "crain",       "crain",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tprcp",       "tprcp",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "hgtsfc",      "orog",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "weasd",       "weasd",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "f10m",        "f10m",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "q2m",         "spfh2m",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "t2m",         "tmp2m",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tsfc",        "tmpsfc",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "vtype",       "vtype",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "stype",       "sotyp",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slmsksfc",    "land",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "vfracsfc",    "veg",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "zorlsfc",     "sfcr",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "uustar",      "fricv",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt1",      "soilt1"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt2",      "soilt2"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt3",      "soilt3"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilt4",      "soilt4"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw1",      "soilw1"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw2",      "soilw2"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw3",      "soilw3"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "soilw4",      "soilw4"     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_1",       "soill1",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_2",       "soill2",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_3",       "soill3",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slc_4",       "soill4",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "slope",       "sltyp",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alnsf",       "alnsf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alnwf",       "alnwf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alvsf",       "alvsf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "alvwf",       "alvwf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "canopy",      "cnwat",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "facsf",       "facsf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "facwf",       "facwf",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "ffhh",        "ffhh",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "ffmm",        "ffmm",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "fice",        "icec",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "hice",        "icetk",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "snoalb",      "snoalb",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "shdmax",      "shdmax",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "shdmin",      "shdmin",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "snowd",       "snod",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tg3",         "tg3",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tisfc",       "tisfc",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "tref",        "tref",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "z_c",         "zc",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "c_0",         "c0",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "c_d",         "cd",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "w_0",         "w0",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "w_d",         "wd",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xt",          "xt",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xz",          "xz",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "dt_cool",     "dtcool",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xs",          "xs",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xu",          "xu",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xv",          "xv",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xtts",        "xtts",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "xzts",        "xzts",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "d_conv",      "dconv",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_sfc",     "qrain",       "qrain",     "fv3_history2d",  "all",  .false.,  "none",  2
+
+"gfs_phys",    "acond",        "acond",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cduvb_ave",    "cduvb_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cpofp",        "cpofp",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "duvb_ave",     "duvb_ave",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csdlf_ave",    "csdlf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csusf_ave",    "csusf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csusf_avetoa", "csusftoa",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csdsf_ave",    "csdsf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csulf_ave",    "csulf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "csulf_avetoa", "csulftoa",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "cwork_ave",    "cwork_aveclm",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "evbs_ave",     "evbs_ave",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "evcw_ave",     "evcw_ave",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "fldcp",        "fldcp",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "hgt_hyblev1",  "hgt_hyblev1",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "spfh_hyblev1", "spfh_hyblev1",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ugrd_hyblev1", "ugrd_hyblev1",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "vgrd_hyblev1", "vgrd_hyblev1",  "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tmp_hyblev1",  "tmp_hyblev1",   "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "gfluxi",       "gflux",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "lhtfl",        "lhtfl",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "shtfl",        "shtfl",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "pevpr",        "pevpr",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "pevpr_ave",    "pevpr_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "sbsno_ave",    "sbsno_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "sfexc",        "sfexc",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "snohf",        "snohf",         "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "snowc_ave",    "snowc_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "spfhmax2m",    "spfhmax_max2m", "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "spfhmin2m",    "spfhmin_min2m", "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tmpmax2m",     "tmax_max2m",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tmpmin2m",     "tmin_min2m",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "ssrun_acc",    "ssrun_acc",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "sunsd_acc",    "sunsd_acc",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "watr_acc",     "watr_acc",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "wilt",         "wilt",          "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "vbdsf_ave",    "vbdsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "vddsf_ave",    "vddsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "nbdsf_ave",    "nbdsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "nddsf_ave",    "nddsf_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "trans_ave",    "trans_ave",     "fv3_history2d",  "all",  .false.,  "none",  2
+
+#=============================================================================================
+#
+#====> This file can be used with diag_manager/v2.0a (or higher) <====
+#
+#
+#  FORMATS FOR FILE ENTRIES (not all input values are used)
+#  ------------------------
+#
+#"file_name", output_freq, "output_units", format, "time_units", "long_name",
+#
+#
+#output_freq:  > 0  output frequency in "output_units"
+#              = 0  output frequency every time step
+#              =-1  output frequency at end of run
+#
+#output_units = units used for output frequency
+#               (years, months, days, minutes, hours, seconds)
+#
+#time_units   = units used to label the time axis
+#               (days, minutes, hours, seconds)
+#
+#
+#  FORMAT FOR FIELD ENTRIES (not all input values are used)
+#  ------------------------
+#
+#"module_name", "field_name", "output_name", "file_name" "time_sampling", time_avg, "other_opts", packing
+#
+#time_avg = .true. or .false.
+#
+#packing  = 1  double precision
+#         = 2  float
+#         = 4  packed 16-bit integers
+#         = 8  packed 1-byte (not tested?)
diff --git a/ush/templates/field_table.FV3_GFS_v15_thompson_mynn b/ush/templates/field_table.FV3_GFS_v15_thompson_mynn
new file mode 100644
index 000000000..ba8b3af4d
--- /dev/null
+++ b/ush/templates/field_table.FV3_GFS_v15_thompson_mynn
@@ -0,0 +1,53 @@
+
+# added by FRE: sphum must be present in atmos
+# specific humidity for moist runs
+ "TRACER", "atmos_mod", "sphum"
+           "longname",     "specific humidity"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=3.e-6" /
+# prognostic cloud water mixing ratio
+ "TRACER", "atmos_mod", "liq_wat"
+           "longname",     "cloud water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic ice water mixing ratio
+ "TRACER", "atmos_mod", "ice_wat"
+           "longname",     "cloud ice mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic rain water mixing ratio
+ "TRACER", "atmos_mod", "rainwat"
+           "longname",     "rain water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic snow water mixing ratio
+ "TRACER", "atmos_mod", "snowwat"
+           "longname",     "snow water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic Grau water mixing ratio
+ "TRACER", "atmos_mod", "graupel"
+           "longname",     "graupel mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic cloud ice number concentration
+ "TRACER", "atmos_mod", "ice_nc"
+           "longname",     "cloud ice water number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic rain number concentration
+ "TRACER", "atmos_mod", "rain_nc"
+           "longname",     "rain number concentration"
+           "units",        "/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic ozone mixing ratio tracer
+ "TRACER", "atmos_mod", "o3mr"
+           "longname",     "ozone mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic subgrid scale turbulent kinetic energy
+ "TRACER", "atmos_mod", "sgs_tke"
+           "longname",     "subgrid scale turbulent kinetic energy"
+           "units",        "m2/s2"
+       "profile_type", "fixed", "surface_value=1.e30" /
+
diff --git a/ush/templates/field_table.rrfs_gfsv16 b/ush/templates/field_table.rrfs_gfsv16
new file mode 100644
index 000000000..69cc9005f
--- /dev/null
+++ b/ush/templates/field_table.rrfs_gfsv16
@@ -0,0 +1,42 @@
+# added by FRE: sphum must be present in atmos
+# specific humidity for moist runs
+ "TRACER", "atmos_mod", "sphum"
+           "longname",     "specific humidity"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic cloud water mixing ratio
+ "TRACER", "atmos_mod", "liq_wat"
+           "longname",     "cloud water mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+ "TRACER", "atmos_mod", "rainwat"
+           "longname",     "rain mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+ "TRACER", "atmos_mod", "ice_wat"
+           "longname",     "cloud ice mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+ "TRACER", "atmos_mod", "snowwat"
+           "longname",     "snow mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+ "TRACER", "atmos_mod", "graupel"
+           "longname",     "graupel mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic ozone mixing ratio tracer
+ "TRACER", "atmos_mod", "o3mr"
+           "longname",     "ozone mixing ratio"
+           "units",        "kg/kg"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# prognostic subgrid scale turbulent kinetic energy
+ "TRACER", "atmos_mod", "sgs_tke"
+           "longname",     "subgrid scale turbulent kinetic energy"
+           "units",        "m2/s2"
+       "profile_type", "fixed", "surface_value=1.e30" /
+# non-prognostic cloud amount
+ "TRACER", "atmos_mod", "cld_amt"
+           "longname",     "cloud amount"
+           "units",        "1"
+       "profile_type", "fixed", "surface_value=1.e30" /
diff --git a/ush/templates/model_configure b/ush/templates/model_configure
index 33b0e527c..43e398ca3 100644
--- a/ush/templates/model_configure
+++ b/ush/templates/model_configure
@@ -20,6 +20,8 @@ debug_affinity:          .true.
 restart_interval:        0
 output_1st_tstep_rst:    .false.
 print_esmf:              {{ print_esmf }}
+write_dopost:            .true.
+output_history:          .false.
 quilting:                {{ quilting }}
 
 {% if quilting  %}
@@ -49,9 +51,9 @@ write_fsyncflag:         .false.
 # Output frequency in time steps (positive values override "nfhout" and 
 # "nfhout_hf").
 #
-nfhout:     1
-nfhmax_hf:  60
-nfhout_hf:  1
+nfhout:     12
+nfhmax_hf:  12
+nfhout_hf:  12
 nsout:      -1
 #
 # Coordinate system used by the output grid.
diff --git a/ush/templates/suites/suite_FV3_GFS_v15_thompson_mynn.xml b/ush/templates/suites/suite_FV3_GFS_v15_thompson_mynn.xml
new file mode 100644
index 000000000..d15325ed6
--- /dev/null
+++ b/ush/templates/suites/suite_FV3_GFS_v15_thompson_mynn.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<suite name="FV3_GFS_v15_thompson_mynn" lib="ccppphys" ver="4">
+  <!-- <init></init> -->
+  <group name="time_vary">
+    <subcycle loop="1">
+      <scheme>GFS_time_vary_pre</scheme>
+      <scheme>GFS_rrtmg_setup</scheme>
+      <scheme>GFS_rad_time_vary</scheme>
+      <scheme>GFS_phys_time_vary</scheme>
+    </subcycle>
+  </group>
+  <group name="radiation">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_rad_reset</scheme>
+      <scheme>sgscloud_radpre</scheme>
+      <scheme>GFS_rrtmg_pre</scheme>
+      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rrtmg_sw</scheme>
+      <scheme>rrtmg_sw_post</scheme>
+      <scheme>rrtmg_lw_pre</scheme>
+      <scheme>rrtmg_lw</scheme>
+      <scheme>sgscloud_radpost</scheme>
+      <scheme>rrtmg_lw_post</scheme>
+      <scheme>GFS_rrtmg_post</scheme>
+    </subcycle>
+  </group>
+  <group name="physics">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_phys_reset</scheme>
+      <scheme>GFS_suite_stateout_reset</scheme>
+      <scheme>get_prs_fv3</scheme>
+      <scheme>GFS_suite_interstitial_1</scheme>
+      <scheme>GFS_surface_generic_pre</scheme>
+      <scheme>GFS_surface_composites_pre</scheme>
+      <scheme>dcyc2t3</scheme>
+
+      <scheme>GFS_surface_composites_inter</scheme>
+      <scheme>GFS_suite_interstitial_2</scheme>
+    </subcycle>
+    <!-- Surface iteration loop -->
+    <subcycle loop="2">
+      <scheme>sfc_diff</scheme>
+      <scheme>GFS_surface_loop_control_part1</scheme>
+      <scheme>sfc_ocean</scheme>
+      <scheme>lsm_noah</scheme>
+      <scheme>sfc_sice</scheme>
+      <scheme>GFS_surface_loop_control_part2</scheme>
+    </subcycle>
+    <!-- End of surface iteration loop -->
+    <subcycle loop="1">
+      <scheme>GFS_surface_composites_post</scheme>
+      <scheme>sfc_diag</scheme>
+      <scheme>sfc_diag_post</scheme>
+      <scheme>GFS_surface_generic_post</scheme>
+      <scheme>mynnedmf_wrapper</scheme>
+      <scheme>GFS_GWD_generic_pre</scheme>
+      <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
+      <scheme>rayleigh_damp</scheme>
+      <scheme>GFS_suite_stateout_update</scheme>
+      <scheme>ozphys_2015</scheme>
+      <scheme>h2ophys</scheme>
+      <scheme>get_phi_fv3</scheme>
+      <scheme>GFS_suite_interstitial_3</scheme>
+      <scheme>GFS_DCNV_generic_pre</scheme>
+      <scheme>GFS_DCNV_generic_post</scheme>
+      <scheme>GFS_SCNV_generic_pre</scheme>
+      <scheme>GFS_SCNV_generic_post</scheme>
+      <scheme>GFS_suite_interstitial_4</scheme>
+      <scheme>GFS_MP_generic_pre</scheme>
+      <scheme>mp_thompson_pre</scheme>
+      <scheme>mp_thompson</scheme>
+      <scheme>mp_thompson_post</scheme>
+      <scheme>GFS_MP_generic_post</scheme>
+      <scheme>maximum_hourly_diagnostics</scheme>
+    </subcycle>
+  </group>
+  <group name="stochastics">
+    <subcycle loop="1">
+      <scheme>GFS_stochastics</scheme>
+    </subcycle>
+  </group>
+  <!-- <finalize></finalize> -->
+</suite>
diff --git a/ush/templates/suites/suite_FV3_GFS_v16beta_no_nsst.xml b/ush/templates/suites/suite_FV3_GFS_v16beta_no_nsst.xml
new file mode 100644
index 000000000..a73d1b561
--- /dev/null
+++ b/ush/templates/suites/suite_FV3_GFS_v16beta_no_nsst.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<suite name="FV3_GFS_v16beta_no_nsst" version="1">
+  <!-- <init></init> -->
+  <group name="fast_physics">
+    <subcycle loop="1">
+      <scheme>fv_sat_adj</scheme>
+    </subcycle>
+  </group>
+  <group name="time_vary">
+    <subcycle loop="1">
+      <scheme>GFS_time_vary_pre</scheme>
+      <scheme>GFS_rrtmg_setup</scheme>
+      <scheme>GFS_rad_time_vary</scheme>
+      <scheme>GFS_phys_time_vary</scheme>
+    </subcycle>
+  </group>
+  <group name="radiation">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_rad_reset</scheme>
+      <scheme>GFS_rrtmg_pre</scheme>
+      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rrtmg_sw</scheme>
+      <scheme>rrtmg_sw_post</scheme>
+      <scheme>rrtmg_lw_pre</scheme>
+      <scheme>rrtmg_lw</scheme>
+      <scheme>rrtmg_lw_post</scheme>
+      <scheme>GFS_rrtmg_post</scheme>
+    </subcycle>
+  </group>
+  <group name="physics">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_phys_reset</scheme>
+      <scheme>GFS_suite_stateout_reset</scheme>
+      <scheme>get_prs_fv3</scheme>
+      <scheme>GFS_suite_interstitial_1</scheme>
+      <scheme>GFS_surface_generic_pre</scheme>
+      <scheme>GFS_surface_composites_pre</scheme>
+      <scheme>dcyc2t3</scheme>
+      <scheme>GFS_surface_composites_inter</scheme>
+      <scheme>GFS_suite_interstitial_2</scheme>
+    </subcycle>
+    <!-- Surface iteration loop -->
+    <subcycle loop="2">
+      <scheme>sfc_diff</scheme>
+      <scheme>GFS_surface_loop_control_part1</scheme>
+      <scheme>sfc_ocean</scheme>
+      <scheme>lsm_noah</scheme>
+      <scheme>sfc_sice</scheme>
+      <scheme>GFS_surface_loop_control_part2</scheme>
+    </subcycle>
+    <!-- End of surface iteration loop -->
+    <subcycle loop="1">
+      <scheme>GFS_surface_composites_post</scheme>
+      <scheme>sfc_diag</scheme>
+      <scheme>sfc_diag_post</scheme>
+      <scheme>GFS_surface_generic_post</scheme>
+      <scheme>GFS_PBL_generic_pre</scheme>
+      <scheme>satmedmfvdifq</scheme>
+      <scheme>GFS_PBL_generic_post</scheme>
+      <scheme>GFS_GWD_generic_pre</scheme>
+      <scheme>cires_ugwp</scheme>
+      <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
+      <scheme>rayleigh_damp</scheme>
+      <scheme>GFS_suite_stateout_update</scheme>
+      <scheme>ozphys_2015</scheme>
+      <scheme>h2ophys</scheme>
+      <scheme>get_phi_fv3</scheme>
+      <scheme>GFS_suite_interstitial_3</scheme>
+      <scheme>GFS_DCNV_generic_pre</scheme>
+      <scheme>samfdeepcnv</scheme>
+      <scheme>GFS_DCNV_generic_post</scheme>
+      <scheme>GFS_SCNV_generic_pre</scheme>
+      <scheme>samfshalcnv</scheme>
+      <scheme>GFS_SCNV_generic_post</scheme>
+      <scheme>GFS_suite_interstitial_4</scheme>
+      <scheme>cnvc90</scheme>
+      <scheme>GFS_MP_generic_pre</scheme>
+      <scheme>gfdl_cloud_microphys</scheme>
+      <scheme>GFS_MP_generic_post</scheme>
+      <scheme>maximum_hourly_diagnostics</scheme>
+    </subcycle>
+  </group>
+  <group name="stochastics">
+    <subcycle loop="1">
+      <scheme>GFS_stochastics</scheme>
+    </subcycle>
+  </group>
+  <!-- <finalize></finalize> -->
+</suite>
diff --git a/ush/templates/suites/suite_rrfs_gfsv16.xml b/ush/templates/suites/suite_rrfs_gfsv16.xml
new file mode 100644
index 000000000..323e22924
--- /dev/null
+++ b/ush/templates/suites/suite_rrfs_gfsv16.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<suite name="rrfs_gfsv16" version="1">
+  <!-- <init></init> -->
+  <group name="fast_physics">
+    <subcycle loop="1">
+      <scheme>fv_sat_adj</scheme>
+    </subcycle>
+  </group>
+  <group name="time_vary">
+    <subcycle loop="1">
+      <scheme>GFS_time_vary_pre</scheme>
+      <scheme>GFS_rrtmg_setup</scheme>
+      <scheme>GFS_rad_time_vary</scheme>
+      <scheme>GFS_phys_time_vary</scheme>
+    </subcycle>
+  </group>
+  <group name="radiation">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_rad_reset</scheme>
+      <scheme>GFS_rrtmg_pre</scheme>
+      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rrtmg_sw</scheme>
+      <scheme>rrtmg_sw_post</scheme>
+      <scheme>rrtmg_lw_pre</scheme>
+      <scheme>rrtmg_lw</scheme>
+      <scheme>rrtmg_lw_post</scheme>
+      <scheme>GFS_rrtmg_post</scheme>
+    </subcycle>
+  </group>
+  <group name="physics">
+    <subcycle loop="1">
+      <scheme>GFS_suite_interstitial_phys_reset</scheme>
+      <scheme>GFS_suite_stateout_reset</scheme>
+      <scheme>get_prs_fv3</scheme>
+      <scheme>GFS_suite_interstitial_1</scheme>
+      <scheme>GFS_surface_generic_pre</scheme>
+      <scheme>GFS_surface_composites_pre</scheme>
+      <scheme>dcyc2t3</scheme>
+      <scheme>GFS_surface_composites_inter</scheme>
+      <scheme>GFS_suite_interstitial_2</scheme>
+    </subcycle>
+    <!-- Surface iteration loop -->
+    <subcycle loop="2">
+      <scheme>sfc_diff</scheme>
+      <scheme>GFS_surface_loop_control_part1</scheme>
+      <scheme>sfc_ocean</scheme>
+      <scheme>lsm_noah</scheme>
+      <scheme>sfc_sice</scheme>
+      <scheme>GFS_surface_loop_control_part2</scheme>
+    </subcycle>
+    <!-- End of surface iteration loop -->
+    <subcycle loop="1">
+      <scheme>GFS_surface_composites_post</scheme>
+      <scheme>sfc_diag</scheme>
+      <scheme>sfc_diag_post</scheme>
+      <scheme>GFS_surface_generic_post</scheme>
+      <scheme>GFS_PBL_generic_pre</scheme>
+      <scheme>satmedmfvdifq</scheme>
+      <scheme>GFS_PBL_generic_post</scheme>
+      <scheme>GFS_GWD_generic_pre</scheme>
+<!--      <scheme>cires_ugwp</scheme> -->
+      <scheme>cires_ugwp_post</scheme>
+      <scheme>GFS_GWD_generic_post</scheme>
+      <scheme>rayleigh_damp</scheme>
+      <scheme>GFS_suite_stateout_update</scheme>
+      <scheme>ozphys_2015</scheme>
+      <scheme>h2ophys</scheme>
+      <scheme>get_phi_fv3</scheme>
+      <scheme>GFS_suite_interstitial_3</scheme>
+      <scheme>GFS_DCNV_generic_pre</scheme>
+<!--      <scheme>samfdeepcnv</scheme> -->
+      <scheme>GFS_DCNV_generic_post</scheme>
+      <scheme>GFS_SCNV_generic_pre</scheme>
+<!--      <scheme>samfshalcnv</scheme> -->
+      <scheme>GFS_SCNV_generic_post</scheme>
+      <scheme>GFS_suite_interstitial_4</scheme>
+<!--      <scheme>cnvc90</scheme> -->
+      <scheme>GFS_MP_generic_pre</scheme>
+      <scheme>gfdl_cloud_microphys</scheme>
+      <scheme>GFS_MP_generic_post</scheme>
+      <scheme>maximum_hourly_diagnostics</scheme>
+    </subcycle>
+  </group>
+  <group name="stochastics">
+    <subcycle loop="1">
+      <scheme>GFS_stochastics</scheme>
+<!--      <scheme>phys_tend</scheme> -->
+    </subcycle>
+  </group>
+  <!-- <finalize></finalize> -->
+</suite>
diff --git a/ush/valid_param_vals.sh b/ush/valid_param_vals.sh
index 237f0aded..75268513c 100644
--- a/ush/valid_param_vals.sh
+++ b/ush/valid_param_vals.sh
@@ -33,6 +33,8 @@ valid_vals_CCPP_PHYS_SUITE=( \
 "FV3_GFS_v16beta" \
 "FV3_RRFS_v1beta" \
 "FV3_RRFS_v1alpha" \
+"FV3_GFS_v15_thompson_mynn" \
+"rrfs_gfsv16" \
 ) 
 valid_vals_GFDLgrid_RES=("48" "96" "192" "384" "768" "1152" "3072")
 valid_vals_EXTRN_MDL_NAME_ICS=("GSMGFS" "FV3GFS" "RAP" "HRRR" "NAM" "GEFS")