Rename MET/METplus name-related variables for clarity.

gsketefian · Mar 22, 2023 · 8001b51 · 8001b51
1 parent a8d43e4
commit 8001b51
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 97 deletions.
diff --git a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh
@@ -16,7 +16,7 @@ source_config_for_task "task_run_vx_ensgrid|task_run_post" ${GLOBAL_VAR_DEFNS_FP
 #
 #-----------------------------------------------------------------------
 #
-. $USHdir/set_met_tool_name.sh
+. $USHdir/get_met_metplus_tool_name.sh
 . $USHdir/set_vx_params.sh
 . $USHdir/set_vx_fhr_list.sh
 #
@@ -48,10 +48,10 @@ scrfunc_dir=$( dirname "${scrfunc_fp}" )
 #
 #-----------------------------------------------------------------------
 #
-set_met_tool_name \
-  met_tool="${MET_TOOL}" \
-  outvarname_met_tool_sc="met_tool_sc" \
-  outvarname_met_tool_pc="met_tool_pc"
+get_met_metplus_tool_name \
+  generic_tool_name="${MET_TOOL}" \
+  outvarname_met_tool_name="met_tool_name" \
+  outvarname_metplus_tool_name="metplus_tool_name"
 #
 #-----------------------------------------------------------------------
 #
@@ -74,7 +74,7 @@ print_info_msg "
 Entering script:  \"${scrfunc_fn}\"
 In directory:     \"${scrfunc_dir}\"
 
-This is the ex-script for the task that runs the METplus ${met_tool_pc}
+This is the ex-script for the task that runs the METplus ${metplus_tool_name}
 tool either to generate ensemble products without performing verification
 (if running the GenEnsProd tool) or to perform ensemble-based verification
 (if running the EnsembleStat tool).
@@ -239,7 +239,7 @@ ${FCST_INPUT_FN_TEMPLATE},
 done
 
 OUTPUT_BASE="${vx_output_basedir}${slash_cdate_or_null}"
-OUTPUT_DIR="${OUTPUT_BASE}/metprd/${met_tool_pc}"
+OUTPUT_DIR="${OUTPUT_BASE}/metprd/${metplus_tool_name}"
 STAGING_DIR="${OUTPUT_BASE}/stage/${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 #
 #-----------------------------------------------------------------------
@@ -319,8 +319,8 @@ if [ "${field_is_APCPgt01h}" = "TRUE" ]; then
 else
   metplus_config_tmpl_fn="${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 fi
-metplus_config_tmpl_fn="${met_tool_pc}_${metplus_config_tmpl_fn}"
-metplus_config_fn="${met_tool_pc}_${FIELDNAME_IN_MET_FILEDIR_NAMES}"
+metplus_config_tmpl_fn="${metplus_tool_name}_${metplus_config_tmpl_fn}"
+metplus_config_fn="${metplus_tool_name}_${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 metplus_log_fn="${metplus_config_fn}"
 #
 # Add prefixes and suffixes (extensions) to the base file names.
@@ -409,7 +409,7 @@ $settings"
 #-----------------------------------------------------------------------
 #
 print_info_msg "$VERBOSE" "
-Calling METplus to run MET's ${met_tool_sc} tool for field(s): ${FIELDNAME_IN_MET_FILEDIR_NAMES}"
+Calling METplus to run MET's ${met_tool_name} tool for field(s): ${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \
   -c ${metplus_config_fp} || \
@@ -426,7 +426,7 @@ METplus configuration file used is:
 #
 print_info_msg "
 ========================================================================
-METplus ${met_tool_pc} tool completed successfully.
+METplus ${metplus_tool_name} tool completed successfully.
 
 Exiting script:  \"${scrfunc_fn}\"
 In directory:    \"${scrfunc_dir}\"

diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh
@@ -16,7 +16,7 @@ source_config_for_task "task_run_vx_gridstat|task_run_vx_pointstat|task_run_post
 #
 #-----------------------------------------------------------------------
 #
-. $USHdir/set_met_tool_name.sh
+. $USHdir/get_met_metplus_tool_name.sh
 . $USHdir/set_vx_params.sh
 . $USHdir/set_vx_fhr_list.sh
 #
@@ -48,10 +48,10 @@ scrfunc_dir=$( dirname "${scrfunc_fp}" )
 #
 #-----------------------------------------------------------------------
 #
-set_met_tool_name \
-  met_tool="${MET_TOOL}" \
-  outvarname_met_tool_sc="met_tool_sc" \
-  outvarname_met_tool_pc="met_tool_pc"
+get_met_metplus_tool_name \
+  generic_tool_name="${MET_TOOL}" \
+  outvarname_met_tool_name="met_tool_name" \
+  outvarname_metplus_tool_name="metplus_tool_name"
 #
 #-----------------------------------------------------------------------
 #
@@ -64,7 +64,7 @@ print_info_msg "
 Entering script:  \"${scrfunc_fn}\"
 In directory:     \"${scrfunc_dir}\"
 
-This is the ex-script for the task that runs the METplus ${met_tool_pc}
+This is the ex-script for the task that runs the METplus ${metplus_tool_name}
 tool to perform deterministic verification of the specified field (VAR)
 for a single forecast.
 ========================================================================"
@@ -221,7 +221,7 @@ elif [ "${grid_or_point}" = "point" ]; then
 fi
 
 OUTPUT_BASE="${vx_output_basedir}${slash_cdate_ensmem_subdir_or_null}"
-OUTPUT_DIR="${OUTPUT_BASE}/metprd/${met_tool_pc}"
+OUTPUT_DIR="${OUTPUT_BASE}/metprd/${metplus_tool_name}"
 STAGING_DIR="${OUTPUT_BASE}/stage/${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 #
 #-----------------------------------------------------------------------
@@ -301,8 +301,8 @@ if [ "${field_is_APCPgt01h}" = "TRUE" ]; then
 else
   metplus_config_tmpl_fn="${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 fi
-metplus_config_tmpl_fn="${met_tool_pc}_${metplus_config_tmpl_fn}"
-metplus_config_fn="${met_tool_pc}_${FIELDNAME_IN_MET_FILEDIR_NAMES}${USCORE_ENSMEM_NAME_OR_NULL}"
+metplus_config_tmpl_fn="${metplus_tool_name}_${metplus_config_tmpl_fn}"
+metplus_config_fn="${metplus_tool_name}_${FIELDNAME_IN_MET_FILEDIR_NAMES}${USCORE_ENSMEM_NAME_OR_NULL}"
 metplus_log_fn="${metplus_config_fn}"
 #
 # Add prefixes and suffixes (extensions) to the base file names.
@@ -391,7 +391,7 @@ $settings"
 #-----------------------------------------------------------------------
 #
 print_info_msg "$VERBOSE" "
-Calling METplus to run MET's ${met_tool_sc} tool for field(s): ${FIELDNAME_IN_MET_FILEDIR_NAMES}"
+Calling METplus to run MET's ${met_tool_name} tool for field(s): ${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \
   -c ${metplus_config_fp} || \
@@ -408,7 +408,7 @@ METplus configuration file used is:
 #
 print_info_msg "
 ========================================================================
-METplus ${met_tool_pc} tool completed successfully.
+METplus ${metplus_tool_name} tool completed successfully.
 
 Exiting script:  \"${scrfunc_fn}\"
 In directory:    \"${scrfunc_dir}\"

diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh
@@ -16,7 +16,7 @@ source_config_for_task "task_run_vx_ensgrid_mean|task_run_vx_enspoint_mean|task_
 #
 #-----------------------------------------------------------------------
 #
-. $USHdir/set_met_tool_name.sh
+. $USHdir/get_met_metplus_tool_name.sh
 . $USHdir/set_vx_params.sh
 . $USHdir/set_vx_fhr_list.sh
 #
@@ -48,10 +48,10 @@ scrfunc_dir=$( dirname "${scrfunc_fp}" )
 #
 #-----------------------------------------------------------------------
 #
-set_met_tool_name \
-  met_tool="${MET_TOOL}" \
-  outvarname_met_tool_sc="met_tool_sc" \
-  outvarname_met_tool_pc="met_tool_pc"
+get_met_metplus_tool_name \
+  generic_tool_name="${MET_TOOL}" \
+  outvarname_met_tool_name="met_tool_name" \
+  outvarname_metplus_tool_name="metplus_tool_name"
 #
 #-----------------------------------------------------------------------
 #
@@ -64,7 +64,7 @@ print_info_msg "
 Entering script:  \"${scrfunc_fn}\"
 In directory:     \"${scrfunc_dir}\"
 
-This is the ex-script for the task that runs the METplus ${met_tool_pc}
+This is the ex-script for the task that runs the METplus ${metplus_tool_name}
 tool to perform verification of the specified field (VAR) on the ensemble
 mean.
 ========================================================================"
@@ -196,7 +196,7 @@ elif [ "${grid_or_point}" = "point" ]; then
 fi
 
 OUTPUT_BASE="${vx_output_basedir}${slash_cdate_or_null}"
-OUTPUT_DIR="${OUTPUT_BASE}/metprd/${met_tool_pc}_ensmean"
+OUTPUT_DIR="${OUTPUT_BASE}/metprd/${metplus_tool_name}_ensmean"
 STAGING_DIR="${OUTPUT_BASE}/stage/${FIELDNAME_IN_MET_FILEDIR_NAMES}_ensmean"
 #
 #-----------------------------------------------------------------------
@@ -285,8 +285,8 @@ if [ "${field_is_APCPgt01h}" = "TRUE" ]; then
 else
   metplus_config_tmpl_fn="${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 fi
-metplus_config_tmpl_fn="${met_tool_pc}_ensmean_${metplus_config_tmpl_fn}"
-metplus_config_fn="${met_tool_pc}_ensmean_${FIELDNAME_IN_MET_FILEDIR_NAMES}"
+metplus_config_tmpl_fn="${metplus_tool_name}_ensmean_${metplus_config_tmpl_fn}"
+metplus_config_fn="${metplus_tool_name}_ensmean_${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 metplus_log_fn="${metplus_config_fn}"
 #
 # Add prefixes and suffixes (extensions) to the base file names.
@@ -375,7 +375,7 @@ $settings"
 #-----------------------------------------------------------------------
 #
 print_info_msg "$VERBOSE" "
-Calling METplus to run MET's ${met_tool_sc} tool for field(s): ${FIELDNAME_IN_MET_FILEDIR_NAMES}"
+Calling METplus to run MET's ${met_tool_name} tool for field(s): ${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \
   -c ${metplus_config_fp} || \
@@ -392,7 +392,7 @@ METplus configuration file used is:
 #
 print_info_msg "
 ========================================================================
-METplus ${met_tool_pc} tool completed successfully.
+METplus ${metplus_tool_name} tool completed successfully.
 
 Exiting script:  \"${scrfunc_fn}\"
 In directory:    \"${scrfunc_dir}\"

diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh
@@ -16,7 +16,7 @@ source_config_for_task "task_run_vx_ensgrid_prob|task_run_vx_enspoint_prob|task_
 #
 #-----------------------------------------------------------------------
 #
-. $USHdir/set_met_tool_name.sh
+. $USHdir/get_met_metplus_tool_name.sh
 . $USHdir/set_vx_params.sh
 . $USHdir/set_vx_fhr_list.sh
 #
@@ -48,10 +48,10 @@ scrfunc_dir=$( dirname "${scrfunc_fp}" )
 #
 #-----------------------------------------------------------------------
 #
-set_met_tool_name \
-  met_tool="${MET_TOOL}" \
-  outvarname_met_tool_sc="met_tool_sc" \
-  outvarname_met_tool_pc="met_tool_pc"
+get_met_metplus_tool_name \
+  generic_tool_name="${MET_TOOL}" \
+  outvarname_met_tool_name="met_tool_name" \
+  outvarname_metplus_tool_name="metplus_tool_name"
 #
 #-----------------------------------------------------------------------
 #
@@ -64,7 +64,7 @@ print_info_msg "
 Entering script:  \"${scrfunc_fn}\"
 In directory:     \"${scrfunc_dir}\"
 
-This is the ex-script for the task that runs the METplus ${met_tool_pc}
+This is the ex-script for the task that runs the METplus ${metplus_tool_name}
 tool to perform verification of the specified field (VAR) on the ensemble
 frequencies/probabilities.
 ========================================================================"
@@ -155,7 +155,7 @@ elif [ "${grid_or_point}" = "point" ]; then
 fi
 
 OUTPUT_BASE="${vx_output_basedir}${slash_cdate_or_null}"
-OUTPUT_DIR="${OUTPUT_BASE}/metprd/${met_tool_pc}_ensprob"
+OUTPUT_DIR="${OUTPUT_BASE}/metprd/${metplus_tool_name}_ensprob"
 STAGING_DIR="${OUTPUT_BASE}/stage/${FIELDNAME_IN_MET_FILEDIR_NAMES}_ensprob"
 #
 #-----------------------------------------------------------------------
@@ -247,8 +247,8 @@ if [ "${field_is_APCPgt01h}" = "TRUE" ]; then
 else
   metplus_config_tmpl_fn="${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 fi
-metplus_config_tmpl_fn="${met_tool_pc}_ensprob_${metplus_config_tmpl_fn}"
-metplus_config_fn="${met_tool_pc}_ensprob_${FIELDNAME_IN_MET_FILEDIR_NAMES}"
+metplus_config_tmpl_fn="${metplus_tool_name}_ensprob_${metplus_config_tmpl_fn}"
+metplus_config_fn="${metplus_tool_name}_ensprob_${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 metplus_log_fn="${metplus_config_fn}"
 #
 # Add prefixes and suffixes (extensions) to the base file names.
@@ -337,7 +337,7 @@ $settings"
 #-----------------------------------------------------------------------
 #
 print_info_msg "$VERBOSE" "
-Calling METplus to run MET's ${met_tool_sc} tool for field(s): ${FIELDNAME_IN_MET_FILEDIR_NAMES}"
+Calling METplus to run MET's ${met_tool_name} tool for field(s): ${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \
   -c ${metplus_config_fp} || \
@@ -354,7 +354,7 @@ METplus configuration file used is:
 #
 print_info_msg "
 ========================================================================
-METplus ${met_tool_pc} tool completed successfully.
+METplus ${metplus_tool_name} tool completed successfully.
 
 Exiting script:  \"${scrfunc_fn}\"
 In directory:    \"${scrfunc_dir}\"

diff --git a/scripts/exregional_run_met_pb2nc_obs.sh b/scripts/exregional_run_met_pb2nc_obs.sh
@@ -16,7 +16,7 @@ source_config_for_task "task_run_met_pb2nc_obs" ${GLOBAL_VAR_DEFNS_FP}
 #
 #-----------------------------------------------------------------------
 #
-. $USHdir/set_met_tool_name.sh
+. $USHdir/get_met_metplus_tool_name.sh
 . $USHdir/set_vx_params.sh
 . $USHdir/set_vx_fhr_list.sh
 #
@@ -48,10 +48,10 @@ scrfunc_dir=$( dirname "${scrfunc_fp}" )
 #
 #-----------------------------------------------------------------------
 #
-set_met_tool_name \
-  met_tool="${MET_TOOL}" \
-  outvarname_met_tool_sc="met_tool_sc" \
-  outvarname_met_tool_pc="met_tool_pc"
+get_met_metplus_tool_name \
+  generic_tool_name="${MET_TOOL}" \
+  outvarname_met_tool_name="met_tool_name" \
+  outvarname_metplus_tool_name="metplus_tool_name"
 #
 #-----------------------------------------------------------------------
 #
@@ -64,7 +64,7 @@ print_info_msg "
 Entering script:  \"${scrfunc_fn}\"
 In directory:     \"${scrfunc_dir}\"
 
-This is the ex-script for the task that runs the METplus tool ${met_tool_pc}
+This is the ex-script for the task that runs the METplus tool ${metplus_tool_name}
 to convert NDAS prep buffer observation files to NetCDF format.
 ========================================================================"
 #
@@ -123,9 +123,9 @@ OBS_INPUT_DIR="${OBS_DIR}"
 OBS_INPUT_FN_TEMPLATE=$( eval echo ${OBS_NDAS_SFCorUPA_FN_TEMPLATE} )
 
 OUTPUT_BASE="${vx_output_basedir}"
-OUTPUT_DIR="${OUTPUT_BASE}/metprd/${met_tool_pc}_obs"
+OUTPUT_DIR="${OUTPUT_BASE}/metprd/${metplus_tool_name}_obs"
 OUTPUT_FN_TEMPLATE="${OBS_INPUT_FN_TEMPLATE}.nc"
-STAGING_DIR="${OUTPUT_BASE}/stage/${met_tool_pc}_obs"
+STAGING_DIR="${OUTPUT_BASE}/stage/${metplus_tool_name}_obs"
 #
 #-----------------------------------------------------------------------
 #
@@ -199,7 +199,7 @@ fi
 #
 # First, set the base file names.
 #
-metplus_config_tmpl_fn="${met_tool_pc}_obs"
+metplus_config_tmpl_fn="${metplus_tool_name}_obs"
 #
 # Note that we append the cycle date to the name of the configuration
 # file because we are considering only observations when using Pb2NC, so
@@ -306,7 +306,7 @@ $settings"
 #-----------------------------------------------------------------------
 #
 print_info_msg "$VERBOSE" "
-Calling METplus to run MET's ${met_tool_sc} tool on observations of type: ${OBTYPE}"
+Calling METplus to run MET's ${met_tool_name} tool on observations of type: ${OBTYPE}"
 ${METPLUS_PATH}/ush/run_metplus.py \
   -c ${METPLUS_CONF}/common.conf \
   -c ${metplus_config_fp} || \
@@ -323,7 +323,7 @@ METplus configuration file used is:
 #
 print_info_msg "
 ========================================================================
-METplus ${met_tool_pc} tool completed successfully.
+METplus ${metplus_tool_name} tool completed successfully.
 
 Exiting script:  \"${scrfunc_fn}\"
 In directory:    \"${scrfunc_dir}\"