From 9132f7412c40d5aea60affd5c04336f1d28854a6 Mon Sep 17 00:00:00 2001
From: "Chan-hoo.Jeon" <chan-hoo.jeon@noaa.gov>
Date: Mon, 14 Mar 2022 15:27:08 +0000
Subject: [PATCH 1/4] Allow multiple template names

---
 scripts/exregional_run_fcst.sh     | 10 +++++-----
 ush/bash_utils/set_file_param.sh   |  5 -----
 ush/create_diag_table_file.sh      |  2 +-
 ush/create_model_configure_file.sh | 11 +++++------
 ush/setup.sh                       | 14 +++++---------
 5 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
index d7c3d48f6..a981c25d0 100755
--- a/scripts/exregional_run_fcst.sh
+++ b/scripts/exregional_run_fcst.sh
@@ -409,19 +409,19 @@ else
 fi
 
 create_symlink_to_file target="${DATA_TABLE_FP}" \
-                       symlink="${run_dir}/${DATA_TABLE_FN}" \
+                       symlink="${run_dir}/data_table" \
                        relative="${relative_link_flag}"
 
 create_symlink_to_file target="${FIELD_TABLE_FP}" \
-                       symlink="${run_dir}/${FIELD_TABLE_FN}" \
+                       symlink="${run_dir}/field_table" \
                        relative="${relative_link_flag}"
 
 create_symlink_to_file target="${NEMS_CONFIG_FP}" \
-                       symlink="${run_dir}/${NEMS_CONFIG_FN}" \
+                       symlink="${run_dir}/nems.configure" \
                        relative="${relative_link_flag}"
 
 create_symlink_to_file target="${FIELD_DICT_FP}" \
-                       symlink="${run_dir}/${FIELD_DICT_FN}" \
+                       symlink="${run_dir}/fd_nems.yaml" \
                        relative="${relative_link_flag}"
 
 if [ ${WRITE_DOPOST} = "TRUE" ]; then
@@ -452,7 +452,7 @@ cycle's (cdate) run directory (run_dir) failed:
   run_dir = \"${run_dir}\""
 else
   create_symlink_to_file target="${FV3_NML_FP}" \
-                         symlink="${run_dir}/${FV3_NML_FN}" \
+                         symlink="${run_dir}/input.nml" \
                          relative="${relative_link_flag}"
 fi
 #
diff --git a/ush/bash_utils/set_file_param.sh b/ush/bash_utils/set_file_param.sh
index 3e0d13349..2be5de4ab 100644
--- a/ush/bash_utils/set_file_param.sh
+++ b/ush/bash_utils/set_file_param.sh
@@ -122,11 +122,6 @@ Setting parameter \"$param\" in file \"$file\" to \"$value\" ..."
     regex_search="^(\s*$param\s*=)(.*)"
     regex_replace="\1 $value"
     ;;
-#
-  "${FV3_NML_FN}")
-    regex_search="^(\s*$param\s*=)(.*)"
-    regex_replace="\1 $value"
-    ;;
 #
   "${DIAG_TABLE_FN}")
     regex_search="(.*)(<$param>)(.*)"
diff --git a/ush/create_diag_table_file.sh b/ush/create_diag_table_file.sh
index 41ca941bf..dbe31735a 100644
--- a/ush/create_diag_table_file.sh
+++ b/ush/create_diag_table_file.sh
@@ -81,7 +81,7 @@ run directory...
 
   run_dir = \"${run_dir}\""
 
-  diag_table_fp="${run_dir}/${DIAG_TABLE_FN}"
+  diag_table_fp="${run_dir}/diag_table"
   print_info_msg "$VERBOSE" "
 
 Using the template diagnostics table file:
diff --git a/ush/create_model_configure_file.sh b/ush/create_model_configure_file.sh
index 814187765..ba2c00e74 100644
--- a/ush/create_model_configure_file.sh
+++ b/ush/create_model_configure_file.sh
@@ -86,8 +86,7 @@ dt_atmos \
 #-----------------------------------------------------------------------
 #
   print_info_msg "$VERBOSE" "
-Creating a model configuration file (\"${MODEL_CONFIG_FN}\") in the specified
-run directory (run_dir):
+Creating the model_configure file in the specified run directory (run_dir):
   run_dir = \"${run_dir}\""
 #
 # Extract from cdate the starting year, month, day, and hour of the forecast.
@@ -216,7 +215,7 @@ run directory (run_dir):
   'nsout': ${nsout}"
 
   print_info_msg $VERBOSE "
-The variable \"settings\" specifying values to be used in the \"${MODEL_CONFIG_FN}\"
+The variable \"settings\" specifying values to be used in the model_configure
 file has been set as follows:
 #-----------------------------------------------------------------------
 settings =
@@ -224,18 +223,18 @@ $settings"
 #
 #-----------------------------------------------------------------------
 #
-# Call a python script to generate the experiment's actual MODEL_CONFIG_FN
+# Call a python script to generate the experiment's actual model_configure
 # file from the template file.
 #
 #-----------------------------------------------------------------------
 #
-  model_config_fp="${run_dir}/${MODEL_CONFIG_FN}"
+  model_config_fp="${run_dir}/model_configure"
   $USHDIR/fill_jinja_template.py -q \
                                  -u "${settings}" \
                                  -t ${MODEL_CONFIG_TMPL_FP} \
                                  -o ${model_config_fp} || \
   print_err_msg_exit "\
-Call to python script fill_jinja_template.py to create a \"${MODEL_CONFIG_FN}\"
+Call to python script fill_jinja_template.py to create the model_configure
 file from a jinja2 template failed.  Parameters passed to this script are:
   Full path to template rocoto XML file:
     MODEL_CONFIG_TMPL_FP = \"${MODEL_CONFIG_TMPL_FP}\"
diff --git a/ush/setup.sh b/ush/setup.sh
index 01470963d..9460f3dee 100755
--- a/ush/setup.sh
+++ b/ush/setup.sh
@@ -1324,16 +1324,13 @@ set_ozone_param \
 #
 #-----------------------------------------------------------------------
 #
-DATA_TABLE_FP="${EXPTDIR}/${DATA_TABLE_FN}"
-FIELD_TABLE_FP="${EXPTDIR}/${FIELD_TABLE_FN}"
-FV3_NML_FN="${FV3_NML_BASE_SUITE_FN%.*}"
-FV3_NML_FP="${EXPTDIR}/${FV3_NML_FN}"
-NEMS_CONFIG_FP="${EXPTDIR}/${NEMS_CONFIG_FN}"
-
+DATA_TABLE_FP="${EXPTDIR}/data_table"
+FIELD_TABLE_FP="${EXPTDIR}/field_table"
+FV3_NML_FP="${EXPTDIR}/input.nml"
+NEMS_CONFIG_FP="${EXPTDIR}/nems.configure"
 
 check_var_valid_value "USE_USER_STAGED_EXTRN_FILES" "valid_vals_USE_USER_STAGED_EXTRN_FILES"
 USE_USER_STAGED_EXTRN_FILES=$(boolify $USE_USER_STAGED_EXTRN_FILES)
-
 #
 #-----------------------------------------------------------------------
 #
@@ -1387,7 +1384,7 @@ if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
   for (( i=0; i<${NUM_ENS_MEMBERS}; i++ )); do
     ip1=$( printf "$fmt" $((i+1)) )
     ENSMEM_NAMES[$i]="mem${ip1}"
-    FV3_NML_ENSMEM_FPS[$i]="$EXPTDIR/${FV3_NML_FN}_${ENSMEM_NAMES[$i]}"
+    FV3_NML_ENSMEM_FPS[$i]="$EXPTDIR/input.nml_${ENSMEM_NAMES[$i]}"
   done
 fi
 #
@@ -2454,7 +2451,6 @@ FIELD_DICT_FP='${FIELD_DICT_FP}'
 
 DATA_TABLE_FP='${DATA_TABLE_FP}'
 FIELD_TABLE_FP='${FIELD_TABLE_FP}'
-FV3_NML_FN='${FV3_NML_FN}'
 FV3_NML_FP='${FV3_NML_FP}'
 NEMS_CONFIG_FP='${NEMS_CONFIG_FP}'
 

From fc0ecf956f727f8a01d92c8c9555d6096efead41 Mon Sep 17 00:00:00 2001
From: "Chan-hoo.Jeon" <chan-hoo.jeon@noaa.gov>
Date: Sat, 2 Apr 2022 03:29:57 +0000
Subject: [PATCH 2/4] parameterize file_TMPL_FN and add a we2e test

---
 scripts/exregional_run_fcst.sh                | 10 ++--
 .../config.user_defined_templates.sh          | 30 ++++++++++++
 ush/bash_utils/set_file_param.sh              |  5 ++
 ush/config_defaults.sh                        | 49 ++++++++++---------
 ush/create_diag_table_file.sh                 |  2 +-
 ush/create_model_configure_file.sh            | 11 +++--
 ush/setup.sh                                  | 37 ++++++++++----
 7 files changed, 100 insertions(+), 44 deletions(-)
 create mode 100644 tests/WE2E/test_configs/wflow_features/config.user_defined_templates.sh

diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
index a1373059f..331bb6ab4 100755
--- a/scripts/exregional_run_fcst.sh
+++ b/scripts/exregional_run_fcst.sh
@@ -409,19 +409,19 @@ else
 fi
 
 create_symlink_to_file target="${DATA_TABLE_FP}" \
-                       symlink="${run_dir}/data_table" \
+                       symlink="${run_dir}/${DATA_TABLE_FN}" \
                        relative="${relative_link_flag}"
 
 create_symlink_to_file target="${FIELD_TABLE_FP}" \
-                       symlink="${run_dir}/field_table" \
+                       symlink="${run_dir}/${FIELD_TABLE_FN}" \
                        relative="${relative_link_flag}"
 
 create_symlink_to_file target="${NEMS_CONFIG_FP}" \
-                       symlink="${run_dir}/nems.configure" \
+                       symlink="${run_dir}/${NEMS_CONFIG_FN}" \
                        relative="${relative_link_flag}"
 
 create_symlink_to_file target="${FIELD_DICT_FP}" \
-                       symlink="${run_dir}/fd_nems.yaml" \
+                       symlink="${run_dir}/${FIELD_DICT_FN}" \
                        relative="${relative_link_flag}"
 
 if [ ${WRITE_DOPOST} = "TRUE" ]; then
@@ -453,7 +453,7 @@ cycle's (cdate) run directory (run_dir) failed:
   run_dir = \"${run_dir}\""
 else
   create_symlink_to_file target="${FV3_NML_FP}" \
-                         symlink="${run_dir}/input.nml" \
+                         symlink="${run_dir}/${FV3_NML_FN}" \
                          relative="${relative_link_flag}"
 fi
 #
diff --git a/tests/WE2E/test_configs/wflow_features/config.user_defined_templates.sh b/tests/WE2E/test_configs/wflow_features/config.user_defined_templates.sh
new file mode 100644
index 000000000..81185425c
--- /dev/null
+++ b/tests/WE2E/test_configs/wflow_features/config.user_defined_templates.sh
@@ -0,0 +1,30 @@
+#
+# TEST PURPOSE/DESCRIPTION:
+# ------------------------
+#
+# This test checks the capability of the workflow to use user-defined
+# template files.
+#
+
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_CONUS_25km"
+CCPP_PHYS_SUITE="FV3_GFS_v15p2"
+
+EXTRN_MDL_NAME_ICS="FV3GFS"
+EXTRN_MDL_NAME_LBCS="FV3GFS"
+USE_USER_STAGED_EXTRN_FILES="TRUE"
+
+DATE_FIRST_CYCL="20190701"
+DATE_LAST_CYCL="20190701"
+CYCL_HRS=( "00" )
+
+FCST_LEN_HRS="6"
+LBC_SPEC_INTVL_HRS="3"
+
+DATA_TABLE_TMPL_FN="data_table"
+DIAG_TABLE_TMPL_FN="diag_table"
+FIELD_TABLE_TMPL_FN="field_table"
+MODEL_CONFIG_TMPL_FN="model_configure"
+NEMS_CONFIG_TMPL_FN="nems.configure"
diff --git a/ush/bash_utils/set_file_param.sh b/ush/bash_utils/set_file_param.sh
index 2be5de4ab..3e0d13349 100644
--- a/ush/bash_utils/set_file_param.sh
+++ b/ush/bash_utils/set_file_param.sh
@@ -122,6 +122,11 @@ Setting parameter \"$param\" in file \"$file\" to \"$value\" ..."
     regex_search="^(\s*$param\s*=)(.*)"
     regex_replace="\1 $value"
     ;;
+#
+  "${FV3_NML_FN}")
+    regex_search="^(\s*$param\s*=)(.*)"
+    regex_replace="\1 $value"
+    ;;
 #
   "${DIAG_TABLE_FN}")
     regex_search="(.*)(<$param>)(.*)"
diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
index 466344f68..a5f9921b1 100644
--- a/ush/config_defaults.sh
+++ b/ush/config_defaults.sh
@@ -343,28 +343,31 @@ DOT_OR_USCORE="_"
 # from which the namelist files for each of the enesemble members are
 # generated.
 #
-# DIAG_TABLE_FN:
-# Name of file that specifies the fields that the forecast model will 
-# output.
-#
-# FIELD_TABLE_FN:
-# Name of file that specifies the tracers that the forecast model will
-# read in from the IC/LBC files.
-#
-# DATA_TABLE_FN:
-# Name of file that specifies ???
-#
-# MODEL_CONFIG_FN:
-# Name of file that specifies ???
-#
-# NEMS_CONFIG_FN:
-# Name of file that specifies ???
-#
 # FV3_EXEC_FN:
 # Name to use for the forecast model executable when it is copied from
 # the directory in which it is created in the build step to the executables
 # directory (EXECDIR; this is set during experiment generation).
 #
+# DIAG_TABLE_TMPL_FN:
+# Name of a template fille that specifies the output fields of the forecast model
+# (ufs-weather-model: diag_table) followed by [dot_ccpp_phys_suite]. Its default
+# value is the same as the designated file name.
+#
+# FIELD_TABLE_TMPL_FN:
+# Name of a template file that specifies the tracers in IC/LBC files of the forecast
+# model (ufs-weather-mode: field_table) followed by [dot_ccpp_phys_suite]. Its
+# default value is the same as the designated file name.
+#
+# MODEL_CONFIG_TMPL_FN:
+# Name of a template file that contains settings and configurations for the 
+# NUOPC/ESMF main component (ufs-weather-model: model_config). Its default value
+# is the same as the designated file name.
+#
+# NEMS_CONFIG_TMPL_FN:
+# Name of a template file that contains information about the various NEMS 
+# components and their run sequence (ufs-weather-model: nems.configure). Its 
+# default value is the same as the designated file name.
+#
 # FCST_MODEL:
 # Name of forecast model (default=ufs-weather-model)
 #
@@ -409,18 +412,18 @@ EXPT_CONFIG_FN="config.sh"
 
 RGNL_GRID_NML_FN="regional_grid.nml"
 
-DATA_TABLE_FN="data_table"
-DIAG_TABLE_FN="diag_table"
-FIELD_TABLE_FN="field_table"
 FV3_NML_BASE_SUITE_FN="input.nml.FV3"
 FV3_NML_YAML_CONFIG_FN="FV3.input.yml"
 FV3_NML_BASE_ENS_FN="input.nml.base_ens"
-MODEL_CONFIG_FN="model_configure"
-NEMS_CONFIG_FN="nems.configure"
 FV3_EXEC_FN="ufs_model"
 
-FCST_MODEL="ufs-weather-model"
+DATA_TABLE_TMPL_FN=""
+DIAG_TABLE_TMPL_FN=""
+FIELD_TABLE_TMPL_FN=""
+MODEL_CONFIG_TMPL_FN=""
+NEMS_CONFIG_TMPL_FN=""
 
+FCST_MODEL="ufs-weather-model"
 WFLOW_XML_FN="FV3LAM_wflow.xml"
 GLOBAL_VAR_DEFNS_FN="var_defns.sh"
 EXTRN_MDL_ICS_VAR_DEFNS_FN="extrn_mdl_ics_var_defns.sh"
diff --git a/ush/create_diag_table_file.sh b/ush/create_diag_table_file.sh
index dbe31735a..41ca941bf 100644
--- a/ush/create_diag_table_file.sh
+++ b/ush/create_diag_table_file.sh
@@ -81,7 +81,7 @@ run directory...
 
   run_dir = \"${run_dir}\""
 
-  diag_table_fp="${run_dir}/diag_table"
+  diag_table_fp="${run_dir}/${DIAG_TABLE_FN}"
   print_info_msg "$VERBOSE" "
 
 Using the template diagnostics table file:
diff --git a/ush/create_model_configure_file.sh b/ush/create_model_configure_file.sh
index ba2c00e74..814187765 100644
--- a/ush/create_model_configure_file.sh
+++ b/ush/create_model_configure_file.sh
@@ -86,7 +86,8 @@ dt_atmos \
 #-----------------------------------------------------------------------
 #
   print_info_msg "$VERBOSE" "
-Creating the model_configure file in the specified run directory (run_dir):
+Creating a model configuration file (\"${MODEL_CONFIG_FN}\") in the specified
+run directory (run_dir):
   run_dir = \"${run_dir}\""
 #
 # Extract from cdate the starting year, month, day, and hour of the forecast.
@@ -215,7 +216,7 @@ Creating the model_configure file in the specified run directory (run_dir):
   'nsout': ${nsout}"
 
   print_info_msg $VERBOSE "
-The variable \"settings\" specifying values to be used in the model_configure
+The variable \"settings\" specifying values to be used in the \"${MODEL_CONFIG_FN}\"
 file has been set as follows:
 #-----------------------------------------------------------------------
 settings =
@@ -223,18 +224,18 @@ $settings"
 #
 #-----------------------------------------------------------------------
 #
-# Call a python script to generate the experiment's actual model_configure
+# Call a python script to generate the experiment's actual MODEL_CONFIG_FN
 # file from the template file.
 #
 #-----------------------------------------------------------------------
 #
-  model_config_fp="${run_dir}/model_configure"
+  model_config_fp="${run_dir}/${MODEL_CONFIG_FN}"
   $USHDIR/fill_jinja_template.py -q \
                                  -u "${settings}" \
                                  -t ${MODEL_CONFIG_TMPL_FP} \
                                  -o ${model_config_fp} || \
   print_err_msg_exit "\
-Call to python script fill_jinja_template.py to create the model_configure
+Call to python script fill_jinja_template.py to create a \"${MODEL_CONFIG_FN}\"
 file from a jinja2 template failed.  Parameters passed to this script are:
   Full path to template rocoto XML file:
     MODEL_CONFIG_TMPL_FP = \"${MODEL_CONFIG_TMPL_FP}\"
diff --git a/ush/setup.sh b/ush/setup.sh
index 9460f3dee..f9089e4fd 100755
--- a/ush/setup.sh
+++ b/ush/setup.sh
@@ -1216,11 +1216,18 @@ 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}"
+# Designated name as the input files of the forecast model (ufs-weather-model)
+DATA_TABLE_FN="data_table"
+DIAG_TABLE_FN="diag_table"
+FIELD_TABLE_FN="field_table"
+MODEL_CONFIG_FN="model_configure"
+NEMS_CONFIG_FN="nems.configure"
+
+DATA_TABLE_TMPL_FN="${DATA_TABLE_TMPL_FN:-${DATA_TABLE_FN}}"
+DIAG_TABLE_TMPL_FN="${DIAG_TABLE_TMPL_FN:-${DIAG_TABLE_FN}}${dot_ccpp_phys_suite_or_null}"
+FIELD_TABLE_TMPL_FN="${FIELD_TABLE_TMPL_FN:-${FIELD_TABLE_FN}}${dot_ccpp_phys_suite_or_null}"
+MODEL_CONFIG_TMPL_FN="${MODEL_CONFIG_TMPL_FN:-${MODEL_CONFIG_FN}}"
+NEMS_CONFIG_TMPL_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}"
@@ -1324,13 +1331,16 @@ set_ozone_param \
 #
 #-----------------------------------------------------------------------
 #
-DATA_TABLE_FP="${EXPTDIR}/data_table"
-FIELD_TABLE_FP="${EXPTDIR}/field_table"
-FV3_NML_FP="${EXPTDIR}/input.nml"
-NEMS_CONFIG_FP="${EXPTDIR}/nems.configure"
+DATA_TABLE_FP="${EXPTDIR}/${DATA_TABLE_FN}"
+FIELD_TABLE_FP="${EXPTDIR}/${FIELD_TABLE_FN}"
+FV3_NML_FN="${FV3_NML_BASE_SUITE_FN%.*}"
+FV3_NML_FP="${EXPTDIR}/${FV3_NML_FN}"
+NEMS_CONFIG_FP="${EXPTDIR}/${NEMS_CONFIG_FN}"
+
 
 check_var_valid_value "USE_USER_STAGED_EXTRN_FILES" "valid_vals_USE_USER_STAGED_EXTRN_FILES"
 USE_USER_STAGED_EXTRN_FILES=$(boolify $USE_USER_STAGED_EXTRN_FILES)
+
 #
 #-----------------------------------------------------------------------
 #
@@ -1384,7 +1394,7 @@ if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
   for (( i=0; i<${NUM_ENS_MEMBERS}; i++ )); do
     ip1=$( printf "$fmt" $((i+1)) )
     ENSMEM_NAMES[$i]="mem${ip1}"
-    FV3_NML_ENSMEM_FPS[$i]="$EXPTDIR/input.nml_${ENSMEM_NAMES[$i]}"
+    FV3_NML_ENSMEM_FPS[$i]="$EXPTDIR/${FV3_NML_FN}_${ENSMEM_NAMES[$i]}"
   done
 fi
 #
@@ -2426,6 +2436,12 @@ FV3_NML_ENSMEM_FPS=${fv3_nml_ensmem_fps_str}
 #
 GLOBAL_VAR_DEFNS_FP='${GLOBAL_VAR_DEFNS_FP}'
 
+DATA_TABLE_FN='${DATA_TABLE_FN}'
+DIAG_TABLE_FN='${DIAG_TABLE_FN}'
+FIELD_TABLE_FN='${FIELD_TABLE_FN}'
+MODEL_CONFIG_FN='${MODEL_CONFIG_FN}'
+NEMS_CONFIG_FN='${NEMS_CONFIG_FN}'
+
 DATA_TABLE_TMPL_FN='${DATA_TABLE_TMPL_FN}'
 DIAG_TABLE_TMPL_FN='${DIAG_TABLE_TMPL_FN}'
 FIELD_TABLE_TMPL_FN='${FIELD_TABLE_TMPL_FN}'
@@ -2451,6 +2467,7 @@ FIELD_DICT_FP='${FIELD_DICT_FP}'
 
 DATA_TABLE_FP='${DATA_TABLE_FP}'
 FIELD_TABLE_FP='${FIELD_TABLE_FP}'
+FV3_NML_FN='${FV3_NML_FN}'
 FV3_NML_FP='${FV3_NML_FP}'
 NEMS_CONFIG_FP='${NEMS_CONFIG_FP}'
 

From 3e8dc11430bda56451ad47cc771c8a3fdce439de Mon Sep 17 00:00:00 2001
From: "Chan-hoo.Jeon" <chan-hoo.jeon@noaa.gov>
Date: Sat, 2 Apr 2022 03:51:11 +0000
Subject: [PATCH 3/4] Increase maxtries_task for make_grid/orog/sfc_climo

---
 ush/config_defaults.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
index a5f9921b1..7e8ee4a8f 100644
--- a/ush/config_defaults.sh
+++ b/ush/config_defaults.sh
@@ -1649,9 +1649,9 @@ WTIME_VX_ENSPOINT_PROB="01:00:00"
 #
 # Maximum number of attempts.
 #
-MAXTRIES_MAKE_GRID="1"
-MAXTRIES_MAKE_OROG="1"
-MAXTRIES_MAKE_SFC_CLIMO="1"
+MAXTRIES_MAKE_GRID="2"
+MAXTRIES_MAKE_OROG="2"
+MAXTRIES_MAKE_SFC_CLIMO="2"
 MAXTRIES_GET_EXTRN_ICS="1"
 MAXTRIES_GET_EXTRN_LBCS="1"
 MAXTRIES_MAKE_ICS="1"

From 7a3eb77bdf93e564ab1c6b798f8ff2632a576a97 Mon Sep 17 00:00:00 2001
From: "Chan-hoo.Jeon" <chan-hoo.jeon@noaa.gov>
Date: Mon, 4 Apr 2022 16:30:29 +0000
Subject: [PATCH 4/4] Modify file name and description

---
 ...h => config.specify_template_filenames.sh} |  0
 ush/config_defaults.sh                        | 23 +++++++++++--------
 ush/setup.sh                                  |  6 ++++-
 3 files changed, 18 insertions(+), 11 deletions(-)
 rename tests/WE2E/test_configs/wflow_features/{config.user_defined_templates.sh => config.specify_template_filenames.sh} (100%)

diff --git a/tests/WE2E/test_configs/wflow_features/config.user_defined_templates.sh b/tests/WE2E/test_configs/wflow_features/config.specify_template_filenames.sh
similarity index 100%
rename from tests/WE2E/test_configs/wflow_features/config.user_defined_templates.sh
rename to tests/WE2E/test_configs/wflow_features/config.specify_template_filenames.sh
diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
index 7e8ee4a8f..be96316d7 100644
--- a/ush/config_defaults.sh
+++ b/ush/config_defaults.sh
@@ -349,24 +349,27 @@ DOT_OR_USCORE="_"
 # directory (EXECDIR; this is set during experiment generation).
 #
 # DIAG_TABLE_TMPL_FN:
-# Name of a template fille that specifies the output fields of the forecast model
-# (ufs-weather-model: diag_table) followed by [dot_ccpp_phys_suite]. Its default
-# value is the same as the designated file name.
+# Name of a template file that specifies the output fields of the forecast 
+# model (ufs-weather-model: diag_table) followed by [dot_ccpp_phys_suite]. 
+# Its default value is the name of the file that the ufs weather model 
+# expects to read in.
 #
 # FIELD_TABLE_TMPL_FN:
-# Name of a template file that specifies the tracers in IC/LBC files of the forecast
-# model (ufs-weather-mode: field_table) followed by [dot_ccpp_phys_suite]. Its
-# default value is the same as the designated file name.
+# Name of a template file that specifies the tracers in IC/LBC files of the 
+# forecast model (ufs-weather-mode: field_table) followed by [dot_ccpp_phys_suite]. 
+# Its default value is the name of the file that the ufs weather model expects 
+# to read in.
 #
 # MODEL_CONFIG_TMPL_FN:
 # Name of a template file that contains settings and configurations for the 
-# NUOPC/ESMF main component (ufs-weather-model: model_config). Its default value
-# is the same as the designated file name.
+# NUOPC/ESMF main component (ufs-weather-model: model_config). Its default 
+# value is the name of the file that the ufs weather model expects to read in.
 #
 # NEMS_CONFIG_TMPL_FN:
 # Name of a template file that contains information about the various NEMS 
-# components and their run sequence (ufs-weather-model: nems.configure). Its 
-# default value is the same as the designated file name.
+# components and their run sequence (ufs-weather-model: nems.configure). 
+# Its default value is the name of the file that the ufs weather model expects 
+# to read in.
 #
 # FCST_MODEL:
 # Name of forecast model (default=ufs-weather-model)
diff --git a/ush/setup.sh b/ush/setup.sh
index f9089e4fd..cf76d1d2b 100755
--- a/ush/setup.sh
+++ b/ush/setup.sh
@@ -1216,12 +1216,16 @@ fi
 #
 dot_ccpp_phys_suite_or_null=".${CCPP_PHYS_SUITE}"
 
-# Designated name as the input files of the forecast model (ufs-weather-model)
+# Names of input files that the forecast model (ufs-weather-model) expects 
+# to read in.  These should only be changed if the input file names in the 
+# forecast model code are changed.
+#----------------------------------
 DATA_TABLE_FN="data_table"
 DIAG_TABLE_FN="diag_table"
 FIELD_TABLE_FN="field_table"
 MODEL_CONFIG_FN="model_configure"
 NEMS_CONFIG_FN="nems.configure"
+#----------------------------------
 
 DATA_TABLE_TMPL_FN="${DATA_TABLE_TMPL_FN:-${DATA_TABLE_FN}}"
 DIAG_TABLE_TMPL_FN="${DIAG_TABLE_TMPL_FN:-${DIAG_TABLE_FN}}${dot_ccpp_phys_suite_or_null}"