Clean up comments; move around variable settings for consistency with…

… other variables.

parm/metplus/GridStat_APCP.conf

@@ -115,18 +115,20 @@ GRID_STAT_MET_CONFIG_OVERRIDES = cat_thresh = [NA]; cnt_thresh = [NA]; cnt_logic
 #
 # List of forecast and corresponding observation fields to process.
 #
-# Lead to use both in naming of the output .stat and .nc files and for
-# lead values in those files.
-#
-# The specification of set_attr_lead below causes MET/METplus to use the
-# lead values in the variable LEAD_SEQ set above, which are the same for
-# all ensemble forecast members (i.e. regardless of whether members are
-# time lagged with respect to the nominal cycle date specified by cdate).
-# If set_attr_lead were not specified as below, then MET/METplus would
-# get the lead from the input forecast file, and that would in general
-# differ from one ensemble member to the next depending on whether the
-# member is time-lagged.  That would cause confusion, so here, we always
-# use lead values with zero lead corresponding to cdate.
+# Note on use of set_attr_lead and ensemble member time-lagging:
+# -------------------------------------------------------------
+# The set_attr_lead parameter appearing below in [FCST|OBS]_VAR<n>_OPTIONS
+# specifies the lead to use both in naming of the output .stat and .nc
+# files and for setting the lead values contained in those files.  This
+# option causes MET/METplus to use the lead values in the variable LEAD_SEQ
+# set above, which are the same for all ensemble forecast members (i.e.
+# regardless of whether members are time lagged with respect to the
+# nominal cycle date specified by cdate).  If set_attr_lead were not
+# specified as below, then MET/METplus would get the lead from the input
+# forecast file, and that would in general differ from one ensemble member
+# to the next depending on whether the member is time-lagged.  That would
+# cause confusion, so here, we always use lead values with zero lead
+# corresponding to the nominal cdate.
 #
 ACCUM_HH = {{accum_hh}}
 FCST_VAR1_NAME = {{fieldname_in_met_output}}

parm/metplus/GridStat_REFC.conf

@@ -114,18 +114,20 @@ GRID_STAT_MET_CONFIG_OVERRIDES = cat_thresh = []; cnt_thresh = [NA]; cnt_logic =
 #
 # List of forecast and corresponding observation fields to process.
 #
-# Lead to use both in naming of the output .stat and .nc files and for
-# lead values in those files.
-#
-# The specification of set_attr_lead below causes MET/METplus to use the
-# lead values in the variable LEAD_SEQ set above, which are the same for
-# all ensemble forecast members (i.e. regardless of whether members are
-# time lagged with respect to the nominal cycle date specified by cdate).
-# If set_attr_lead were not specified as below, then MET/METplus would
-# get the lead from the input forecast file, and that would in general
-# differ from one ensemble member to the next depending on whether the
-# member is time-lagged.  That would cause confusion, so here, we always
-# use lead values with zero lead corresponding to cdate.
+# Note on use of set_attr_lead and ensemble member time-lagging:
+# -------------------------------------------------------------
+# The set_attr_lead parameter appearing below in [FCST|OBS]_VAR<n>_OPTIONS
+# specifies the lead to use both in naming of the output .stat and .nc
+# files and for setting the lead values contained in those files.  This
+# option causes MET/METplus to use the lead values in the variable LEAD_SEQ
+# set above, which are the same for all ensemble forecast members (i.e.
+# regardless of whether members are time lagged with respect to the
+# nominal cycle date specified by cdate).  If set_attr_lead were not
+# specified as below, then MET/METplus would get the lead from the input
+# forecast file, and that would in general differ from one ensemble member
+# to the next depending on whether the member is time-lagged.  That would
+# cause confusion, so here, we always use lead values with zero lead
+# corresponding to the nominal cdate.
 #
 FCST_VAR1_NAME = {{fieldname_in_fcst_input}}
 FCST_VAR1_LEVELS = L0

parm/metplus/GridStat_RETOP.conf

@@ -114,18 +114,20 @@ GRID_STAT_MET_CONFIG_OVERRIDES = cat_thresh = []; cnt_thresh = [NA]; cnt_logic =
 #
 # List of forecast and corresponding observation fields to process.
 #
-# Lead to use both in naming of the output .stat and .nc files and for
-# lead values in those files.
-#
-# The specification of set_attr_lead below causes MET/METplus to use the
-# lead values in the variable LEAD_SEQ set above, which are the same for
-# all ensemble forecast members (i.e. regardless of whether members are
-# time lagged with respect to the nominal cycle date specified by cdate).
-# If set_attr_lead were not specified as below, then MET/METplus would
-# get the lead from the input forecast file, and that would in general
-# differ from one ensemble member to the next depending on whether the
-# member is time-lagged.  That would cause confusion, so here, we always
-# use lead values with zero lead corresponding to cdate.
+# Note on use of set_attr_lead and ensemble member time-lagging:
+# -------------------------------------------------------------
+# The set_attr_lead parameter appearing below in [FCST|OBS]_VAR<n>_OPTIONS
+# specifies the lead to use both in naming of the output .stat and .nc
+# files and for setting the lead values contained in those files.  This
+# option causes MET/METplus to use the lead values in the variable LEAD_SEQ
+# set above, which are the same for all ensemble forecast members (i.e.
+# regardless of whether members are time lagged with respect to the
+# nominal cycle date specified by cdate).  If set_attr_lead were not
+# specified as below, then MET/METplus would get the lead from the input
+# forecast file, and that would in general differ from one ensemble member
+# to the next depending on whether the member is time-lagged.  That would
+# cause confusion, so here, we always use lead values with zero lead
+# corresponding to the nominal cdate.
 #
 FCST_VAR1_NAME = {{fieldname_in_fcst_input}}
 FCST_VAR1_LEVELS = L0

parm/metplus/PointStat_ADPSFC.conf

@@ -176,18 +176,20 @@ POINT_STAT_ONCE_PER_FIELD = False
 #
 # List of forecast and corresponding observation fields to process.
 #
-# Lead to use both in naming of the output .stat and .nc files and for
-# lead values in those files.
-#
-# The specification of set_attr_lead below causes MET/METplus to use the
-# lead values in the variable LEAD_SEQ set above, which are the same for
-# all ensemble forecast members (i.e. regardless of whether members are
-# time lagged with respect to the nominal cycle date specified by cdate).
-# If set_attr_lead were not specified as below, then MET/METplus would
-# get the lead from the input forecast file, and that would in general
-# differ from one ensemble member to the next depending on whether the
-# member is time-lagged.  That would cause confusion, so here, we always
-# use lead values with zero lead corresponding to cdate.
+# Note on use of set_attr_lead and ensemble member time-lagging:
+# -------------------------------------------------------------
+# The set_attr_lead parameter appearing below in [FCST|OBS]_VAR<n>_OPTIONS
+# specifies the lead to use both in naming of the output .stat and .nc
+# files and for setting the lead values contained in those files.  This
+# option causes MET/METplus to use the lead values in the variable LEAD_SEQ
+# set above, which are the same for all ensemble forecast members (i.e.
+# regardless of whether members are time lagged with respect to the
+# nominal cycle date specified by cdate).  If set_attr_lead were not
+# specified as below, then MET/METplus would get the lead from the input
+# forecast file, and that would in general differ from one ensemble member
+# to the next depending on whether the member is time-lagged.  That would
+# cause confusion, so here, we always use lead values with zero lead
+# corresponding to the nominal cdate.
 #
 FCST_VAR1_NAME = TMP
 FCST_VAR1_LEVELS = Z2
@@ -209,29 +211,29 @@ OBS_VAR3_LEVELS = Z2
 
 FCST_VAR4_NAME = UGRD
 FCST_VAR4_LEVELS = Z10
-FCST_VAR4_THRESH = ge2.572 ;; m/s or 5kts
+FCST_VAR4_THRESH = ge2.572
 FCST_VAR4_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
 OBS_VAR4_NAME = UGRD
 OBS_VAR4_LEVELS = Z10
-OBS_VAR4_THRESH = ge2.572 ;; m/s or 5kts
+OBS_VAR4_THRESH = ge2.572
 
 FCST_VAR5_NAME = VGRD
 FCST_VAR5_LEVELS = Z10
-FCST_VAR5_THRESH = ge2.572 ;; m/s or 5kts
+FCST_VAR5_THRESH = ge2.572
 FCST_VAR5_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
 OBS_VAR5_NAME = VGRD
 OBS_VAR5_LEVELS = Z10
-OBS_VAR5_THRESH = ge2.572 ;; m/s or 5kts
+OBS_VAR5_THRESH = ge2.572
 
 FCST_VAR6_NAME = WIND
 FCST_VAR6_LEVELS = Z10
-FCST_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433 ;; m/s or 5, 10, 20, 30kts
+FCST_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433
 FCST_VAR6_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
-                    GRIB2_pdt = 0; ;; derive instantaneous 10-m wind from U/V components, overriding max 10-m wind
-OBS_VAR6_OPTIONS = GRIB2_pdt = 0; ;; derive instantaneous 10-m wind from U/V components, overriding max 10-m wind
+                    GRIB2_pdt = 0; ;; Derive instantaneous 10-m wind from U/V components, overriding max 10-m wind.
 OBS_VAR6_NAME = WIND
 OBS_VAR6_LEVELS = Z10
-OBS_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433 ;; m/s or 5, 10, 20, 30kts
+OBS_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433
+OBS_VAR6_OPTIONS = GRIB2_pdt = 0; ;; Derive instantaneous 10-m wind from U/V components, overriding max 10-m wind.
 
 FCST_VAR7_NAME = PRMSL
 FCST_VAR7_LEVELS = Z0
@@ -256,12 +258,12 @@ FCST_VAR9_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
                     censor_thresh = [>16090];
                     censor_val = [16090];
                     interp = { type = [ { method = NEAREST; width = 1; } ]; }
-OBS_VAR9_OPTIONS = censor_thresh = [>16090];
-                   censor_val = [16090];
-                   interp = { type = [ { method = NEAREST; width = 1; } ]; }
 OBS_VAR9_NAME = VIS
 OBS_VAR9_LEVELS = L0
 OBS_VAR9_THRESH = lt805, lt1609, lt4828, lt8045, ge8045, lt16090
+OBS_VAR9_OPTIONS = censor_thresh = [>16090];
+                   censor_val = [16090];
+                   interp = { type = [ { method = NEAREST; width = 1; } ]; }
 
 FCST_VAR10_NAME = GUST
 FCST_VAR10_LEVELS = Z0

parm/metplus/PointStat_ADPUPA.conf

@@ -176,18 +176,20 @@ POINT_STAT_ONCE_PER_FIELD = False
 #
 # List of forecast and corresponding observation fields to process.
 #
-# Lead to use both in naming of the output .stat and .nc files and for
-# lead values in those files.
-#
-# The specification of set_attr_lead below causes MET/METplus to use the
-# lead values in the variable LEAD_SEQ set above, which are the same for
-# all ensemble forecast members (i.e. regardless of whether members are
-# time lagged with respect to the nominal cycle date specified by cdate).
-# If set_attr_lead were not specified as below, then MET/METplus would
-# get the lead from the input forecast file, and that would in general
-# differ from one ensemble member to the next depending on whether the
-# member is time-lagged.  That would cause confusion, so here, we always
-# use lead values with zero lead corresponding to cdate.
+# Note on use of set_attr_lead and ensemble member time-lagging:
+# -------------------------------------------------------------
+# The set_attr_lead parameter appearing below in [FCST|OBS]_VAR<n>_OPTIONS
+# specifies the lead to use both in naming of the output .stat and .nc
+# files and for setting the lead values contained in those files.  This
+# option causes MET/METplus to use the lead values in the variable LEAD_SEQ
+# set above, which are the same for all ensemble forecast members (i.e.
+# regardless of whether members are time lagged with respect to the
+# nominal cycle date specified by cdate).  If set_attr_lead were not
+# specified as below, then MET/METplus would get the lead from the input
+# forecast file, and that would in general differ from one ensemble member
+# to the next depending on whether the member is time-lagged.  That would
+# cause confusion, so here, we always use lead values with zero lead
+# corresponding to the nominal cdate.
 #
 FCST_VAR1_NAME = TMP
 FCST_VAR1_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
@@ -209,27 +211,27 @@ OBS_VAR3_LEVELS = P1000, P925, P850, P700, P500, P400, P300
 
 FCST_VAR4_NAME = UGRD
 FCST_VAR4_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
-FCST_VAR4_THRESH = ge2.572 ;; m/s or 5kts
+FCST_VAR4_THRESH = ge2.572
 FCST_VAR4_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
 OBS_VAR4_NAME = UGRD
 OBS_VAR4_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
-OBS_VAR4_THRESH = ge2.572 ;; m/s or 5kts
+OBS_VAR4_THRESH = ge2.572
 
 FCST_VAR5_NAME = VGRD
 FCST_VAR5_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
-FCST_VAR5_THRESH = ge2.572 ;; m/s or 5kts
+FCST_VAR5_THRESH = ge2.572
 FCST_VAR5_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
 OBS_VAR5_NAME = VGRD
 OBS_VAR5_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
-OBS_VAR5_THRESH = ge2.572 ;; m/s or 5kts
+OBS_VAR5_THRESH = ge2.572
 
 FCST_VAR6_NAME = WIND
 FCST_VAR6_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
-FCST_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433, ge20.577, ge25.722 ;; m/s or 5, 10, 20, 30, 40, 50kts
+FCST_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433, ge20.577, ge25.722
 FCST_VAR6_OPTIONS = set_attr_lead = "{lead?fmt=%H%M%S}";
 OBS_VAR6_NAME = WIND
 OBS_VAR6_LEVELS = P1000, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10
-OBS_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433, ge20.577, ge25.722 ;; m/s or 5, 10, 20, 30, 40, 50kts
+OBS_VAR6_THRESH = ge2.572, ge2.572&&lt5.144, ge5.144, ge10.288, ge15.433, ge20.577, ge25.722
 
 FCST_VAR7_NAME = HGT
 FCST_VAR7_LEVELS = P1000, P950, P925, P850, P700, P500, P400, P300, P250, P200, P150, P100, P50, P20, P10