Fixes to METplus changes

 - Add forgotten AZCA.poly file
 - Fix error in mask specification in GridStat_ensmean.conf
 - Fix logic for populating VX_MASK files in conf files

Author: mkavulich

parm/metplus/AZCA.poly

@@ -0,0 +1,9 @@
+AZCA
+42.00000 -125.00000
+42.00000 -120.00000
+39.00000 -120.00000
+37.00000 -114.05000
+37.00000 -109.05000
+31.33235 -109.05000
+31.33235 -125.00000
+

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 = {{vx_mask}}
+{{METPLUS_TOOL_NAME}}_MASK_GRID =
 
 # Statistical output types
 {{METPLUS_TOOL_NAME}}_OUTPUT_FLAG_FHO = STAT
@@ -652,4 +652,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}}

scripts/exregional_run_met_genensprod_or_ensemblestat.sh

@@ -315,10 +315,10 @@ fi
 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"
+    if [ -f "${METPLUS_CONF}/${i}.poly" ]; then
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, ${METPLUS_CONF}/${i}.poly"
     else
-      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${VX_MASK[i]}.poly"
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${i}.poly"
     fi
   done
 fi

scripts/exregional_run_met_gridstat_or_pointstat_vx.sh

@@ -333,10 +333,10 @@ fi
 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"
+    if [ -f "${METPLUS_CONF}/${i}.poly" ]; then
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, ${METPLUS_CONF}/${i}.poly"
     else
-      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${VX_MASK[i]}.poly"
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${i}.poly"
     fi
   done
 fi

scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh

@@ -258,10 +258,10 @@ fi
 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"
+    if [ -f "${METPLUS_CONF}/${i}.poly" ]; then
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, ${METPLUS_CONF}/${i}.poly"
     else
-      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${VX_MASK[i]}.poly"
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${i}.poly"
     fi
   done
 fi

scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh

@@ -278,10 +278,10 @@ metplus_log_fn="metplus.log.${metplus_log_bn}"
 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"
+    if [ -f "${METPLUS_CONF}/${i}.poly" ]; then
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, ${METPLUS_CONF}/${i}.poly"
     else
-      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${VX_MASK[i]}.poly"
+      VX_MASK_FILE_LIST="${VX_MASK_FILE_LIST}, {MET_INSTALL_DIR}/share/met/poly/${i}.poly"
     fi
   done
 fi