Major changes to METplus: user-specifiable MASK regions, OMP_NUM_THREADS=4 for parallelized code, general cleanup

 - Always verify on FULL grid
 - Allow users to specify MASK_GRID regions in the config file, using the names of the grid as specified in the METplus users guide (or using custom .poly files in parm/metplus/)
 - Some general conf file cleanup
 - Allow user to specify input file for poly plotting script
 - Fix GOES task names in setup.py
 - New GOES obs in smoke test, test for smoke vx at 12z init; not sure if I'll keep these changes but using them for now

Author: mkavulich

parm/metplus/EnsembleStat.conf

@@ -203,13 +203,7 @@ OBS_{{METPLUS_TOOL_NAME}}_WINDOW_END = {OBS_WINDOW_END}
 {{comment_or_null}}{{METPLUS_TOOL_NAME}}_CLIMO_CDF_BINS = 1
 {{comment_or_null}}{{METPLUS_TOOL_NAME}}_CLIMO_CDF_CENTER_BINS = False
 {{METPLUS_TOOL_NAME}}_CLIMO_CDF_WRITE_BINS = False
-{% if input_field_group in ['APCP', 'ASNOW'] %}
-{{METPLUS_TOOL_NAME}}_MASK_GRID =
-{%- elif input_field_group in ['REFC', 'RETOP'] %}
 {{METPLUS_TOOL_NAME}}_MASK_GRID = FULL
-{%- elif input_field_group in ['SFC', 'UPA'] %}
-{{METPLUS_TOOL_NAME}}_MASK_GRID =
-{%- endif %}
 
 {{METPLUS_TOOL_NAME}}_CI_ALPHA = 0.05
 
@@ -730,6 +724,6 @@ FCST_{{METPLUS_TOOL_NAME}}_INPUT_TEMPLATE = {{fcst_input_fn_template}}
 {{METPLUS_TOOL_NAME}}_CLIMO_STDEV_INPUT_TEMPLATE =
 #
 # Variable used to specify one or more verification mask files for
-# {{MetplusToolName}}.  Not used for this example.
+# {{MetplusToolName}}.
 #
-{{METPLUS_TOOL_NAME}}_VERIFICATION_MASK_TEMPLATE = {MET_INSTALL_DIR}/share/met/poly/CONUS.poly
+{{METPLUS_TOOL_NAME}}_VERIFICATION_MASK_TEMPLATE = {{vx_mask}}

parm/metplus/GridStat_ensmean.conf

@@ -549,7 +549,7 @@ FCST_{{METPLUS_TOOL_NAME}}_PROB_THRESH = ==0.1
 #{{METPLUS_TOOL_NAME}}_CLIMO_CDF_CENTER_BINS = False
 #{{METPLUS_TOOL_NAME}}_CLIMO_CDF_WRITE_BINS = True
 
-{{METPLUS_TOOL_NAME}}_MASK_GRID =
+{{METPLUS_TOOL_NAME}}_MASK_GRID = {{vx_mask}}
 
 # Statistical output types
 {{METPLUS_TOOL_NAME}}_OUTPUT_FLAG_FHO = STAT

parm/metplus/GridStat_ensprob.conf

@@ -533,7 +533,7 @@ FCST_{{METPLUS_TOOL_NAME}}_PROB_THRESH = {{thresh_fcst_prob}}
 #{{METPLUS_TOOL_NAME}}_CLIMO_CDF_CENTER_BINS = False
 #{{METPLUS_TOOL_NAME}}_CLIMO_CDF_WRITE_BINS = True
 
-{{METPLUS_TOOL_NAME}}_MASK_GRID =
+{{METPLUS_TOOL_NAME}}_MASK_GRID = FULL
 
 # Statistical output types
 {{METPLUS_TOOL_NAME}}_OUTPUT_FLAG_FHO = NONE
@@ -643,4 +643,4 @@ FCST_{{METPLUS_TOOL_NAME}}_INPUT_TEMPLATE = {{fcst_input_fn_template}}
 # Variable used to specify one or more verification mask files for
 # {{MetplusToolName}}.  Not used for this example.
 #
-{{METPLUS_TOOL_NAME}}_VERIFICATION_MASK_TEMPLATE = {MET_INSTALL_DIR}/share/met/poly/CONUS.poly
+{{METPLUS_TOOL_NAME}}_VERIFICATION_MASK_TEMPLATE = {{vx_mask}}

parm/metplus/GridStat_or_PointStat.conf

@@ -849,14 +849,8 @@ FCST_{{METPLUS_TOOL_NAME}}_INPUT_TEMPLATE = {{fcst_input_fn_template}}
 # {{METPLUS_TOOL_NAME}}_CLIMO_STDEV_INPUT_DIR.  Not used in this example.
 #
 {{METPLUS_TOOL_NAME}}_CLIMO_STDEV_INPUT_TEMPLATE =
-{#-
-Not sure if the following section for ..._VERIFICATION_MASK_TEMPLATE
-is also nececcary for PointStat.
-#}
-{%- if (METPLUS_TOOL_NAME == 'GRID_STAT') %}
 #
 # Variable used to specify one or more verification mask files for
-# {{MetplusToolName}}.  Not used for this example.
+# {{MetplusToolName}}.
 #
-{{METPLUS_TOOL_NAME}}_VERIFICATION_MASK_TEMPLATE = {MET_INSTALL_DIR}/share/met/poly/CONUS.poly, /scratch1/BMC/hmtb/harrold/ufs-srweather-app/parm/metplus/EAST_ROCKIES.poly
-{%- endif %}
+{{METPLUS_TOOL_NAME}}_VERIFICATION_MASK_TEMPLATE = {{vx_mask}}

parm/metplus/plot_latlon_points.py

@@ -69,16 +69,16 @@ def plot_points_on_map(lats, lons, output_file='map.png', threshold=80):
     parser = argparse.ArgumentParser(
                      description="Plots METplus polyfiles on a map")
 
-#    parser.add_argument('-i', '--input_file', default='latlon.txt',
-#                        help='Name of METplus polyfile')
+    parser.add_argument('-i', '--input_file', default='latlon.txt',
+                        help='Name of METplus polyfile')
 #    parser.add_argument('-o', '--output_file', default='map.png',
 #                        help='Name of output file')
     parser.add_argument('-t', '--threshold', default=80, help='Threshold +/- latitude; if there are plot points closer to the pole than this latitude, a polar projection will be used')
     parser.add_argument('-d', '--debug', action='store_true',
                         help='Script will be run in debug mode with more verbose output')
     pargs = parser.parse_args()
 
-    for polyfile in list(glob.glob("/contrib/spack-stack/spack-stack-1.6.0/envs/fms-2024.01/install/intel/2021.5.0/met-12.0.1-iw45pz7/share/met/poly/*poly")):
+    for polyfile in list(glob.glob(pargs.input_file)):
 
         output_file = Path(polyfile).stem
         lats, lons = read_latlon_file(polyfile)

parm/wflow/verify_ens.yaml

@@ -36,6 +36,7 @@ metatask_GenEnsProd_EnsembleStat_APCP_all_accums:
       OBTYPE: 'CCPA'
       FCST_LEVEL: 'A#ACCUM_HH#'
       FCST_THRESH: 'all'
+      OMP_NUM_THREADS: 4
     dependency:
       metataskdep_pcpcombine_fcst:
         attrs:
@@ -70,6 +71,7 @@ metatask_GenEnsProd_EnsembleStat_ASNOW_all_accums:
       OBTYPE: 'NOHRSC'
       FCST_LEVEL: 'A#ACCUM_HH#'
       FCST_THRESH: 'all'
+      OMP_NUM_THREADS: 4
     dependency:
       and:
         metataskdep_pcpcombine_fcst:
@@ -105,6 +107,7 @@ metatask_GenEnsProd_EnsembleStat_REFC_RETOP:
       OBTYPE: 'MRMS'
       FCST_LEVEL: 'L0'
       FCST_THRESH: 'all'
+      OMP_NUM_THREADS: 4
     dependency:
       and:
         metataskdep_check_post_output: &check_post_output
@@ -157,6 +160,7 @@ metatask_GenEnsProd_EnsembleStat_SFC_UPA:
       ACCUM_HH: '01'
       FCST_LEVEL: 'all'
       FCST_THRESH: 'all'
+      OMP_NUM_THREADS: 4
     walltime: 04:45:00
     dependency:
       metataskdep_check_post_output:
@@ -211,6 +215,7 @@ metatask_GridStat_APCP_all_accums_ensmeanprob:
         ACCUM_HH: '#ACCUM_HH#'
         FCST_LEVEL: 'A#ACCUM_HH#'
         FCST_THRESH: 'all'
+        OMP_NUM_THREADS: 4
       dependency:
         and:
           taskdep_pcpcombine_obs_ccpa:
@@ -238,6 +243,7 @@ metatask_GridStat_ASNOW_all_accums_ensmeanprob:
         ACCUM_HH: '#ACCUM_HH#'
         FCST_LEVEL: 'A#ACCUM_HH#'
         FCST_THRESH: 'all'
+        OMP_NUM_THREADS: 4
       dependency:
         and:
           taskdep_pcpcombine_obs_nohrsc:
@@ -261,6 +267,7 @@ metatask_GridStat_REFC_RETOP_ensprob:
       OBTYPE: 'MRMS'
       FCST_LEVEL: 'L0'
       FCST_THRESH: 'all'
+      OMP_NUM_THREADS: 4
     dependency:
       and:
         datadep_all_get_obs_mrms_complete:

scripts/exregional_run_met_genensprod_or_ensemblestat.sh

@@ -307,6 +307,24 @@ fi
 #
 #-----------------------------------------------------------------------
 #
+# Populate VX_MASK_FILE_LIST based on user selections
+#
+#-----------------------------------------------------------------------
+#
+# This weird logic is needed because in older versions of bash empty arrays are treated as unset
+if [ ${VX_MASK[@]} ]; then
+  VX_MASK_FILE_LIST=""
+  for i in "${VX_MASK[@]}"; do
+    if [ -f "${PARMdir}/${VX_MASK[i]}.poly" ]; then
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, ${PARMdir}/${VX_MASK[i]}.poly"
+    else
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${VX_MASK[i]}.poly"
+    fi
+  done
+fi
+#
+#-----------------------------------------------------------------------
+#
 # Set the names of the template METplus configuration file, the METplus
 # configuration file generated from this template, and the METplus log
 # file.
@@ -401,6 +419,11 @@ settings="\
 'input_level_fcst': '${FCST_LEVEL:-}'
 'input_thresh_fcst': '${FCST_THRESH:-}'
 #
+# Verification mask settings
+#
+'vx_mask': '${VX_MASK_FILE_LIST:-}'
+#
+#
 # Verification configuration dictionary.
 #
 'vx_config_dict':

scripts/exregional_run_met_gridstat_or_pointstat_vx.sh

@@ -23,6 +23,7 @@ sections=(
 for sect in ${sections[*]} ; do
   source_yaml ${GLOBAL_VAR_DEFNS_FP} ${sect}
 done
+echo ${BASH_VERSION}
 #
 #-----------------------------------------------------------------------
 #
@@ -324,6 +325,24 @@ fi
 #
 #-----------------------------------------------------------------------
 #
+# Populate VX_MASK_FILE_LIST based on user selections
+#
+#-----------------------------------------------------------------------
+#
+# This weird logic is needed because in older versions of bash empty arrays are treated as unset
+if [ ${VX_MASK[@]} ]; then
+  VX_MASK_FILE_LIST=""
+  for i in "${VX_MASK[@]}"; do
+    if [ -f "${PARMdir}/${VX_MASK[i]}.poly" ]; then
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, ${PARMdir}/${VX_MASK[i]}.poly"
+    else
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${VX_MASK[i]}.poly"
+    fi
+  done
+fi
+#
+#-----------------------------------------------------------------------
+#
 # Set the names of the template METplus configuration file, the METplus
 # configuration file generated from this template, and the METplus log
 # file.
@@ -418,6 +437,11 @@ settings="\
 'input_level_fcst': '${FCST_LEVEL:-}'
 'input_thresh_fcst': '${FCST_THRESH:-}'
 #
+# Verification mask settings
+#
+'vx_mask': '${VX_MASK_FILE_LIST:-}'
+#
+#
 # Verification configuration dictionary.
 #
 'vx_config_dict': 
@@ -459,7 +483,6 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-
 print_info_msg "$VERBOSE" "
 Calling METplus to run MET's ${metplus_tool_name} tool for field(s): ${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 ${METPLUS_PATH}/ush/run_metplus.py \

scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh

@@ -250,6 +250,24 @@ fi
 #
 #-----------------------------------------------------------------------
 #
+# Populate VX_MASK_FILE_LIST based on user selections
+#
+#-----------------------------------------------------------------------
+#
+# This weird logic is needed because in older versions of bash empty arrays are treated as unset
+if [ ${VX_MASK[@]} ]; then
+  VX_MASK_FILE_LIST=""
+  for i in "${VX_MASK[@]}"; do
+    if [ -f "${PARMdir}/${VX_MASK[i]}.poly" ]; then
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, ${PARMdir}/${VX_MASK[i]}.poly"
+    else
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${VX_MASK[i]}.poly"
+    fi
+  done
+fi
+#
+#-----------------------------------------------------------------------
+#
 # Set the names of the template METplus configuration file, the METplus
 # configuration file generated from this template, and the METplus log
 # file.
@@ -344,6 +362,10 @@ settings="\
 'input_level_fcst': '${FCST_LEVEL:-}'
 'input_thresh_fcst': '${FCST_THRESH:-}'
 #
+# Verification mask settings
+#
+'vx_mask': '${VX_MASK_FILE_LIST:-}'
+#
 # Verification configuration dictionary.
 #
 'vx_config_dict': 
@@ -379,6 +401,7 @@ fi
 #
 #-----------------------------------------------------------------------
 #
+export OMP_NUM_THREADS=4
 print_info_msg "$VERBOSE" "
 Calling METplus to run MET's ${metplus_tool_name} tool for field(s): ${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 ${METPLUS_PATH}/ush/run_metplus.py \

scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh

@@ -270,6 +270,24 @@ metplus_log_fn="metplus.log.${metplus_log_bn}"
 #
 #-----------------------------------------------------------------------
 #
+# Populate VX_MASK_FILE_LIST based on user selections
+#
+#-----------------------------------------------------------------------
+#
+# This weird logic is needed because in older versions of bash empty arrays are treated as unset
+if [ ${VX_MASK[@]} ]; then
+  VX_MASK_FILE_LIST=""
+  for i in "${VX_MASK[@]}"; do
+    if [ -f "${PARMdir}/${VX_MASK[i]}.poly" ]; then
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, ${PARMdir}/${VX_MASK[i]}.poly"
+    else
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${VX_MASK[i]}.poly"
+    fi
+  done
+fi
+#
+#-----------------------------------------------------------------------
+#
 # Load the yaml-like file containing the configuration for ensemble 
 # verification.
 #
@@ -344,6 +362,11 @@ settings="\
 'input_level_fcst': '${FCST_LEVEL:-}'
 'input_thresh_fcst': '${FCST_THRESH:-}'
 #
+# Verification mask settings
+#
+'vx_mask': '${VX_MASK_FILE_LIST:-}'
+#
+#
 # Verification configuration dictionary.
 #
 'vx_config_dict': 
@@ -379,6 +402,7 @@ fi
 #
 #-----------------------------------------------------------------------
 #
+export OMP_NUM_THREADS=4
 print_info_msg "$VERBOSE" "
 Calling METplus to run MET's ${metplus_tool_name} tool for field(s): ${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 ${METPLUS_PATH}/ush/run_metplus.py \