Skip to content

Commit

Permalink
Per issue #1858: checking in latest version. Modified section that ca…
Browse files Browse the repository at this point in the history
…lls set_obs_qty_inc_filt...this new function can now handle old 'obs_quality' entry as well as the new 'obs_quality_inc'. SL
  • Loading branch information
Seth Linden committed Sep 15, 2021
1 parent fc743fb commit 60c8878
Showing 1 changed file with 7 additions and 18 deletions.
25 changes: 7 additions & 18 deletions met/src/tools/core/ensemble_stat/ensemble_stat_conf_info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -819,34 +819,23 @@ void EnsembleStatVxOpt::process_config(GrdFileType ftype, Dictionary &fdict,
<< "Observation error for point verification is "
<< "defined by a table lookup for each observation.\n";
}

// Conf: desc
vx_pd.set_desc(parse_conf_string(&odict, conf_key_desc).c_str());

// Conf: sid_inc
vx_pd.set_sid_inc_filt(parse_conf_sid_list(&odict, conf_key_sid_inc));

// Conf: sid_exc
vx_pd.set_sid_exc_filt(parse_conf_sid_list(&odict, conf_key_sid_exc));

// Conf: obs_qty_inc
// Check for old "obs_quality" field
StringArray obs_qty_sa = odict.lookup_string_array(conf_key_obs_qty);
// Send warning if "obs_quality" is still being used
// Use it instead of "obs_quality_inc" if it is in config file
if(obs_qty_sa.n() > 0){
mlog << Warning << "\nPointStatVxOpt::process_config() -> "
<< "The field \""
<< conf_key_obs_qty
<< "\" is deprecated "
<< "use \"" << conf_key_obs_qty_inc << "\" instead.\n\n";
vx_pd.set_obs_qty_inc_filt(parse_conf_obs_qty(&odict));
} else
vx_pd.set_obs_qty_inc_filt(parse_conf_obs_qty_inc(&odict));

vx_pd.set_obs_qty_inc_filt(parse_conf_obs_qty_inc(&odict));

// Conf: obs_qty_exc
vx_pd.set_obs_qty_exc_filt(parse_conf_obs_qty_exc(&odict));


return;
}

Expand Down

0 comments on commit 60c8878

Please sign in to comment.