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 2003 briercl #2034

Merged
merged 28 commits into from
Feb 2, 2022
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5a7caa2
Per #2003, fix the logic of the log message to state the number of cl…
JohnHalleyGotway Jan 20, 2022
7949663
Per #2003, set block_size = Nx * Ny to make these commands run faster.
JohnHalleyGotway Jan 20, 2022
063d2ac
Per #2003, add climatology_SERIES_ANALYSIS_PROB to unit_climatology.x…
JohnHalleyGotway Jan 25, 2022
807a120
Per #2003, add the climo_cdf dictionary for Series-Analysis. Seems th…
JohnHalleyGotway Jan 25, 2022
b1ca99c
Per #2003, add the Series-Analysis config file used by the new test i…
JohnHalleyGotway Jan 25, 2022
21cabab
Merge branch 'develop' into feature_2003_briercl
JohnHalleyGotway Jan 25, 2022
9fa4712
Merge branch 'develop' into feature_2003_briercl
JohnHalleyGotway Jan 27, 2022
44c2a93
Merge branch 'develop' into feature_2003_briercl
JohnHalleyGotway Jan 28, 2022
a7c639a
Per #2003, this gets BRIERCL and BSS to appear in the Series-Analysis…
JohnHalleyGotway Jan 28, 2022
54a40b8
Per #2003, replace PairBase::climo_cdf from a ClimoCDFInfo object wit…
JohnHalleyGotway Jan 28, 2022
9757ae7
Per #2003, update the vx_statistics library code to handle the ClimoC…
JohnHalleyGotway Jan 28, 2022
fe5a1b6
Per #2003, update the Ensemble-Stat, Grid-Stat, Point-Stat, and Stat-…
JohnHalleyGotway Jan 28, 2022
c11ce3e
Per #2003, working a bit backwards here. Updating the Series-Analysis…
JohnHalleyGotway Jan 28, 2022
06bc393
Per #2003, if block_size is <= 0, automatically reset it to the numbe…
JohnHalleyGotway Jan 29, 2022
59f1c93
Per #2003, add climo_cdf dictionaries to all existing Series-Analysis…
JohnHalleyGotway Jan 29, 2022
59d74d5
Per #2003, ci-run-unit, add support for the climo_cdf.direct_prob con…
JohnHalleyGotway Jan 29, 2022
37b6a97
ci-run-unit Merge branch 'develop' into feature_2003_briercl
JohnHalleyGotway Jan 29, 2022
459a651
Per #2003, error out if no climo prob thresholds are provided when ne…
JohnHalleyGotway Jan 31, 2022
e76ac6b
Per #2003, no code changes, just comments.
JohnHalleyGotway Jan 31, 2022
9ba6b95
Per #2003, ci-run-unit, when aggregating MPR or ORANK lines in Stat-A…
JohnHalleyGotway Jan 31, 2022
4ffaca3
ci-run-unit
JohnHalleyGotway Jan 31, 2022
fa63461
Per #2003, correct the derivation logic for the direct climo probabil…
JohnHalleyGotway Jan 31, 2022
2788ead
Per #2003, correct logic for letting block_size = grid dimension. Can…
JohnHalleyGotway Jan 31, 2022
3f6b150
Per #2003, ci-run-unit, add a test for series_analysis on probability…
JohnHalleyGotway Jan 31, 2022
0eaed5b
Per #2003, tighten up the logic in Series-Analysis for allocating Pai…
JohnHalleyGotway Jan 31, 2022
8db67cb
Per #2003, update the block_size in SeriesAnalysisConfig_climo to set…
JohnHalleyGotway Jan 31, 2022
c3e2703
Per #2003, a little config file cleanup. Remove climo_cdf.write_bins …
JohnHalleyGotway Jan 31, 2022
edcdfd2
Per #2003, this change is unrelated but was requested by John Opatz. …
JohnHalleyGotway Jan 31, 2022
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 #2003, update the Ensemble-Stat, Grid-Stat, Point-Stat, and Stat-…
…Analysis application code to hande the ClimoCDFInfo pointer.
JohnHalleyGotway committed Jan 28, 2022

Verified

This commit was signed with the committer’s verified signature. The key has expired.
tvdeyen Thomas von Deyen
commit fe5a1b6636b14aa347df637f8790cc047d0bbf5e
2 changes: 1 addition & 1 deletion met/src/tools/core/ensemble_stat/ensemble_stat.cc
Original file line number Diff line number Diff line change
@@ -1838,7 +1838,7 @@ void process_grid_vx() {
// Initialize
pd_all.clear();
pd_all.set_ens_size(n_vx_vld[i]);
pd_all.set_climo_cdf_info(conf_info.vx_opt[i].cdf_info);
pd_all.set_climo_cdf_info_ptr(&conf_info.vx_opt[i].cdf_info);
pd_all.ctrl_index = conf_info.vx_opt[i].vx_pd.pd[0][0][0].ctrl_index;
pd_all.skip_const = conf_info.vx_opt[i].vx_pd.pd[0][0][0].skip_const;

Original file line number Diff line number Diff line change
@@ -1023,7 +1023,7 @@ void EnsembleStatVxOpt::set_vx_pd(EnsembleStatConfInfo *conf_info, int ctrl_inde
vx_pd.set_pd_size(n_msg_typ, n_mask, n_interp);

// Store the climo CDF info
vx_pd.set_climo_cdf_info(cdf_info);
vx_pd.set_climo_cdf_info_ptr(&cdf_info);

// Store the list of surface message types
vx_pd.set_msg_typ_sfc(conf_info->msg_typ_sfc);
2 changes: 1 addition & 1 deletion met/src/tools/core/grid_stat/grid_stat.cc
Original file line number Diff line number Diff line change
@@ -1847,7 +1847,7 @@ void get_mask_points(const GridStatVxOpt &vx_opt,
pd.erase();

// Store the climo CDF info
pd.set_climo_cdf_info(vx_opt.cdf_info);
pd.set_climo_cdf_info_ptr(&vx_opt.cdf_info);

// Apply the mask the data fields or fill with default values
apply_mask(*fcst_ptr, mask_mp, pd.f_na);
2 changes: 1 addition & 1 deletion met/src/tools/core/point_stat/point_stat.cc
Original file line number Diff line number Diff line change
@@ -1736,7 +1736,7 @@ void do_hira_ens(int i_vx, const PairDataPoint *pd_ptr) {
hira_pd.clear();
hira_pd.extend(pd_ptr->n_obs);
hira_pd.set_ens_size(gt->size());
hira_pd.set_climo_cdf_info(conf_info.vx_opt[i_vx].cdf_info);
hira_pd.set_climo_cdf_info_ptr(&conf_info.vx_opt[i_vx].cdf_info);
f_ens.extend(gt->size());

// Process each observation point
2 changes: 1 addition & 1 deletion met/src/tools/core/point_stat/point_stat_conf_info.cc
Original file line number Diff line number Diff line change
@@ -972,7 +972,7 @@ void PointStatVxOpt::set_vx_pd(PointStatConfInfo *conf_info) {
vx_pd.set_mpr_thresh(mpr_sa, mpr_ta);

// Store the climo CDF info
vx_pd.set_climo_cdf_info(cdf_info);
vx_pd.set_climo_cdf_info_ptr(&cdf_info);

// Store the surface message type group
cs = surface_msg_typ_group_str;
4 changes: 1 addition & 3 deletions met/src/tools/core/series_analysis/series_analysis.cc
Original file line number Diff line number Diff line change
@@ -678,9 +678,7 @@ void process_scores() {
// Initialize PairDataPoint objects
for(i=0; i<conf_info.block_size; i++) {
pd_ptr[i].erase();
// JHG, this is a bad solution that introduces a 10 second latency.
// Instead, recommend changing PairBase::cdf_info to a pointer
pd_ptr[i].set_climo_cdf_info(conf_info.cdf_info);
pd_ptr[i].set_climo_cdf_info_ptr(&conf_info.cdf_info);
}

// Starting grid point
8 changes: 5 additions & 3 deletions met/src/tools/core/stat_analysis/aggr_stat_line.cc
Original file line number Diff line number Diff line change
@@ -2205,7 +2205,8 @@ void aggr_mpr_lines(LineDataFile &f, STATAnalysisJob &job,
if(m.count(key) == 0) {

bool center = false;
aggr.pd.cdf_info.set_cdf_ta(nint(1.0/job.out_bin_size), center);
aggr.cdf_info.set_cdf_ta(nint(1.0/job.out_bin_size), center);
aggr.pd.set_climo_cdf_info_ptr(&aggr.cdf_info);

aggr.pd.f_na.clear();
aggr.pd.o_na.clear();
@@ -3086,7 +3087,8 @@ void aggr_orank_lines(LineDataFile &f, STATAnalysisJob &job,
if(m.count(key) == 0) {
aggr.clear();
bool center = false;
aggr.ens_pd.cdf_info.set_cdf_ta(nint(1.0/job.out_bin_size), center);
aggr.cdf_info.set_cdf_ta(nint(1.0/job.out_bin_size), center);
aggr.ens_pd.set_climo_cdf_info_ptr(&aggr.cdf_info);
aggr.ens_pd.obs_error_flag = !is_bad_data(cur.ens_mean_oerr);
aggr.ens_pd.set_ens_size(cur.n_ens);
aggr.ens_pd.extend(cur.total);
@@ -3141,7 +3143,7 @@ void aggr_orank_lines(LineDataFile &f, STATAnalysisJob &job,
m[key].ens_pd.v_na.add(n_valid);

// Derive ensemble from climo mean and standard deviation
derive_climo_vals(m[key].ens_pd.cdf_info,
derive_climo_vals(&m[key].cdf_info,
cur.climo_mean, cur.climo_stdev, climo_vals);

// Store empirical CRPS stats
2 changes: 2 additions & 0 deletions met/src/tools/core/stat_analysis/aggr_stat_line.h
Original file line number Diff line number Diff line change
@@ -141,6 +141,7 @@ struct AggrMPRInfo {
StatHdrInfo hdr;
ConcatString fcst_var, obs_var;
PairDataPoint pd;
ClimoCDFInfo cdf_info;
};

struct AggrISCInfo {
@@ -152,6 +153,7 @@ struct AggrISCInfo {
struct AggrENSInfo {
StatHdrInfo hdr;
PairDataEnsemble ens_pd;
ClimoCDFInfo cdf_info;
NumArray me_na, mse_na, me_oerr_na, mse_oerr_na;
void clear();
};