Per #1575, no real changes here. Just reorganizing the location of th…

…e mpr_sa and mpr_ta members.
dtcenter · Mar 30, 2021 · 96076cd · 96076cd
1 parent 9e3e7d8
commit 96076cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/met/src/tools/core/grid_stat/grid_stat_conf_info.cc b/met/src/tools/core/grid_stat/grid_stat_conf_info.cc
@@ -495,6 +495,9 @@ void GridStatVxOpt::clear() {
    var_name.clear();
    var_suffix.clear();
 
+   mpr_sa.clear();
+   mpr_ta.clear();
+
    fcat_ta.clear();
    ocat_ta.clear();
 
@@ -506,9 +509,6 @@ void GridStatVxOpt::clear() {
    owind_ta.clear();
    wind_logic = SetLogic_None;
 
-   mpr_sa.clear();
-   mpr_ta.clear();
-
    mask_grid.clear();
    mask_poly.clear();
    mask_name.clear();
@@ -617,6 +617,10 @@ void GridStatVxOpt::process_config(
    // Populate the output_flag array with map values
    for(i=0; i<n_txt; i++) output_flag[i] = output_map[txt_file_type[i]];
 
+   // Conf: mpr_column and mpr_thresh
+   mpr_sa = odict.lookup_string_array(conf_key_mpr_column);
+   mpr_ta = odict.lookup_thresh_array(conf_key_mpr_thresh);
+
    // Conf: cat_thresh
    fcat_ta = fdict.lookup_thresh_array(conf_key_cat_thresh);
    ocat_ta = odict.lookup_thresh_array(conf_key_cat_thresh);
@@ -643,10 +647,6 @@ void GridStatVxOpt::process_config(
       int_to_setlogic(fdict.lookup_int(conf_key_wind_logic)),
       int_to_setlogic(odict.lookup_int(conf_key_wind_logic)));
 
-   // Conf: mpr_column and mpr_thresh
-   mpr_sa = odict.lookup_string_array(conf_key_mpr_column);
-   mpr_ta = odict.lookup_thresh_array(conf_key_mpr_thresh);
-
    // Dump the contents of the current thresholds
    if(mlog.verbosity_level() >= 5) {
       mlog << Debug(5)
@@ -884,10 +884,10 @@ bool GridStatVxOpt::is_uv_match(const GridStatVxOpt &v) const {
    //
    // The following do not impact matched pairs:
    //    desc, var_name, var_suffix,
+   //    mpr_sa, mpr_ta,
    //    fcat_ta, ocat_ta,
    //    fcnt_ta, ocnt_ta, cnt_logic,
    //    fwind_ta, owind_ta, wind_logic,
-   //    mpr_sa, mpr_ta,
    //    eclv_points, cdf_info, ci_alpha
    //    boot_info, nbrhd_info,
    //    wave_1d_beg, wave_1d_end, grad_dx, grad_dy,

diff --git a/met/src/tools/core/grid_stat/grid_stat_conf_info.h b/met/src/tools/core/grid_stat/grid_stat_conf_info.h
@@ -145,6 +145,9 @@ class GridStatVxOpt {
       ConcatString     var_suffix;       // nc_pairs_var_suffix string
                                          // nc_pairs_var_str is deprecated
 
+      StringArray      mpr_sa;           // MPR filtering columns
+      ThreshArray      mpr_ta;           // MPR filtering thresholds
+
       ThreshArray      fcat_ta;          // fcst categorical thresholds
       ThreshArray      ocat_ta;          // obs categorical thresholds
 
@@ -156,9 +159,6 @@ class GridStatVxOpt {
       ThreshArray      owind_ta;         // obs wind speed thresholds
       SetLogic         wind_logic;       // wind speed field logic
 
-      StringArray      mpr_sa;           // MPR filtering columns
-      ThreshArray      mpr_ta;           // MPR filtering thresholds
-
       StringArray      mask_grid;        // Masking grid strings
       StringArray      mask_poly;        // Masking polyline strings