Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature 1575 large_diffs #1741

Merged
merged 20 commits into from
Apr 1, 2021
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4307b18
Per #1575, add mpr_column and mpr_thresh entries to all of the Grid-S…
JohnHalleyGotway Mar 28, 2021
42f8fc7
Per #1575, define config strings to be parsed from the config files.
JohnHalleyGotway Mar 28, 2021
bd50708
Per #1575, store col_name_ptr and col_thresh_ptr in PairBase. They ar…
JohnHalleyGotway Mar 28, 2021
688fbbb
Per #1575, add MPR filtering logic to pair_data_point.cc. Include fil…
JohnHalleyGotway Mar 28, 2021
9a76f7a
Per #1575, update point_stat to parse the mpr_column and mpr_thresh c…
JohnHalleyGotway Mar 28, 2021
eaacfaf
Per #1575, updated Grid-Stat to parse mpr_column and mpr_thresh options.
JohnHalleyGotway Mar 28, 2021
2d08c43
Per #1575, update Point-Stat to store mpr_sa and mpr_ta locally and t…
JohnHalleyGotway Mar 28, 2021
cb00ea4
Per #1575, renamed PairDataEnsemble::subset_pairs() to subset_pairs_o…
JohnHalleyGotway Mar 30, 2021
5fc8996
Per #1575, some cleanup, moving check_fo_thresh() utility function fr…
JohnHalleyGotway Mar 30, 2021
94ff6a4
Per #1575, when implementing this for Grid-Stat, I realized that ther…
JohnHalleyGotway Mar 30, 2021
b7913b8
Per #1575, updating pair_data_point.h/.cc to handle the subsetting of…
JohnHalleyGotway Mar 30, 2021
9e3e7d8
Per #1575, rename subset_pairs() to subset_pairs_cnt_thresh() to be a…
JohnHalleyGotway Mar 30, 2021
96076cd
Per #1575, no real changes here. Just reorganizing the location of th…
JohnHalleyGotway Mar 30, 2021
dac057c
Per #1575, make the subset_pairs() utility function a member function…
JohnHalleyGotway Mar 30, 2021
27c257f
Per #1575, need to actually set the mpr_thresh!
JohnHalleyGotway Mar 30, 2021
b228eed
Per #1575, update subset_pairs_mpr_thresh() to make sure the StringAr…
JohnHalleyGotway Mar 30, 2021
d9b27ae
Per #1575, replace PairDataPoint::subset_pairs_mpr_thresh() with a ut…
JohnHalleyGotway Mar 31, 2021
1358c63
Per #1575, add documentation about mpr_column and mpr_thresh.
JohnHalleyGotway Mar 31, 2021
8acc282
Per #1575, mpr_columns can also include CLIMO_CDF.
JohnHalleyGotway Mar 31, 2021
af73fb0
Per #1575, add tests for Grid-Stat and Point-Stat to exercise the mpr…
JohnHalleyGotway Apr 1, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Per #1575, store col_name_ptr and col_thresh_ptr in PairBase. They ar…
…e being used for PairDataPoint to do MPR filtering in Grid-Stat and Point-Stat. But they could be eventually be extended to filter ORANK columns for Ensemble-Stat.
  • Loading branch information
JohnHalleyGotway committed Mar 28, 2021

Verified

This commit was signed with the committer’s verified signature.
rouault Even Rouault
commit bd50708ad649384122e7c7c94d9be0884c6a69a9
17 changes: 17 additions & 0 deletions met/src/libcode/vx_statistics/pair_base.cc
Original file line number Diff line number Diff line change
@@ -68,6 +68,9 @@ void PairBase::clear() {
mask_sid_ptr = (StringArray *) 0; // Not allocated
mask_llpnt_ptr = (MaskLatLon *) 0; // Not allocated

col_name_ptr = (const StringArray *) 0; // Not allocated
col_thresh_ptr = (const ThreshArray *) 0; // Not allocated

msg_typ.clear();
msg_typ_vals.clear();

@@ -117,6 +120,9 @@ void PairBase::erase() {
mask_sid_ptr = (StringArray *) 0; // Not allocated
mask_llpnt_ptr = (MaskLatLon *) 0; // Not allocated

col_name_ptr = (const StringArray *) 0; // Not allocated
col_thresh_ptr = (const ThreshArray *) 0; // Not allocated

msg_typ.clear();
msg_typ_vals.clear();

@@ -217,6 +223,17 @@ void PairBase::set_mask_llpnt_ptr(MaskLatLon *llpnt_ptr) {

////////////////////////////////////////////////////////////////////////

void PairBase::set_col_name_thresh(const StringArray *sa_ptr,
const ThreshArray *ta_ptr) {

col_name_ptr = sa_ptr;
col_thresh_ptr = ta_ptr;

return;
}

////////////////////////////////////////////////////////////////////////

void PairBase::set_msg_typ(const char *c) {

msg_typ = c;
11 changes: 11 additions & 0 deletions met/src/libcode/vx_statistics/pair_base.h
Original file line number Diff line number Diff line change
@@ -71,6 +71,15 @@ class PairBase {
MaskLatLon *mask_llpnt_ptr; // Pointer to Lat/Lon thresholds
// which is not allocated

//////////////////////////////////////////////////////////////////

const StringArray *col_name_ptr; // Names of data columns or diffs of columns
// which is not allocated
const ThreshArray *col_thresh_ptr; // Filtering thresholds for the data columns
// which is not allocated

//////////////////////////////////////////////////////////////////

ConcatString msg_typ; // Name of the verifying message type
StringArray msg_typ_vals; // Message type values to be included

@@ -126,6 +135,8 @@ class PairBase {
void set_mask_sid_ptr(StringArray *);
void set_mask_llpnt_ptr(MaskLatLon *);

void set_col_name_thresh(const StringArray *, const ThreshArray *);

void set_msg_typ(const char *);
void set_msg_typ_vals(const StringArray &);