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.

Sign up for GitHub

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 1259 BIN_MEAN OBS_THRESH #2082

Merged
merged 22 commits into from
Mar 3, 2022
Merged

Feature 1259 BIN_MEAN OBS_THRESH #2082

Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
4d9cdc2
Per #1259, this is a work in progress. Added hooks for PCT, PSTD, PRC…
JohnHalleyGotway Feb 23, 2022
522c58d
Per #1259, add the eclv_points config option to Ensemble-Stat.
JohnHalleyGotway Feb 23, 2022
1e157c6
Per #1259, this actually fixes a bug in Ensemble-Stat. Consolidated t…
JohnHalleyGotway Feb 23, 2022
500fa5b
Per #1259, ci-run-unit strip out commented-out old code for writing s…
JohnHalleyGotway Feb 23, 2022
1ac8c61
Per #1259, no real change to point_stat. Just removing a blank line.
JohnHalleyGotway Feb 23, 2022
eebe649
Per #1259, making progress. Added prob_pct_thresh option to ensemble-…
JohnHalleyGotway Feb 23, 2022
730b8f9
ci-run-unit Merge branch 'develop' into feature_1259_es_prob_stats
JohnHalleyGotway Feb 23, 2022
38c0c45
Merge branch 'develop' into feature_1259_es_prob_stats
JohnHalleyGotway Feb 24, 2022
17d81fc
Per #1259, update the Ensemble-Stat chapter of the user's guide.
JohnHalleyGotway Feb 24, 2022
422efa5
Per #1259, move the derivation of cdp thresholds into the thresh_arra…
JohnHalleyGotway Feb 26, 2022
7a82732
Per #1259, ci-run-unit add logic to ensemble-stat to compute probabil…
JohnHalleyGotway Feb 26, 2022
1cc8594
Per #1259, make the MET test script Ensemble-Stat config file more co…
JohnHalleyGotway Mar 1, 2022
77063ec
Per #1259, wrangling Ensemble-Stat config files, trying to make them …
JohnHalleyGotway Mar 1, 2022
210a240
Per #1259, update unit_met_test_scripts.xml to accurately list the ou…
JohnHalleyGotway Mar 1, 2022
157a33a
Per #1259, update unit_climatology_1.0deg.xml to demonstrate the comp…
JohnHalleyGotway Mar 1, 2022
a163265
Per #1259, update compute_pct_mean() to support a flag to incidate wh…
JohnHalleyGotway Mar 1, 2022
64568dd
Per #1259, fix the logic for how to size the probabilistic output lin…
JohnHalleyGotway Mar 1, 2022
5f68b23
Per #1259, remove debug print statement.
JohnHalleyGotway Mar 1, 2022
eed918c
Merge branch 'develop' into feature_1259_es_prob_stats
JohnHalleyGotway Mar 2, 2022
5172d6c
Merge remote-tracking branch 'origin/develop' into feature_1259_es_pr…
JohnHalleyGotway Mar 2, 2022
ba00326
Per #1259, tweaking the logic slightly when writing the BIN_MEAN outp…
JohnHalleyGotway Mar 3, 2022
f08457b
Merge remote-tracking branch 'origin/develop' into feature_1259_es_pr…
JohnHalleyGotway Mar 3, 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
17 changes: 13 additions & 4 deletions met/src/tools/core/ensemble_stat/ensemble_stat.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2618,7 +2618,7 @@ void do_pct_cat_thresh(const EnsembleStatVxOpt &vx_opt,
} // end for i_bin

// Write the probabilistic output
write_pct_info(vx_opt, pct_info, n_bin, true);
write_pct_info(vx_opt, pct_info, n_bin, false);

} // end for i_ta

Expand Down Expand Up @@ -2708,7 +2708,7 @@ void do_pct_cdp_thresh(const EnsembleStatVxOpt &vx_opt,
} // end for i_bin

// Write the probabilistic output
write_pct_info(vx_opt, pct_info, n_bin, false);
write_pct_info(vx_opt, pct_info, n_bin, true);

// Dealloate memory
if(pct_info) { delete [] pct_info; pct_info = (PCTInfo *) 0; }
Expand All @@ -2720,7 +2720,7 @@ void do_pct_cdp_thresh(const EnsembleStatVxOpt &vx_opt,

void write_pct_info(const EnsembleStatVxOpt &vx_opt,
const PCTInfo *pct_info, int n_bin,
bool sum_total) {
bool cdp_thresh) {

// Write output for each bin
for(int i_bin=0; i_bin<n_bin; i_bin++) {
Expand Down Expand Up @@ -2776,7 +2776,16 @@ void write_pct_info(const EnsembleStatVxOpt &vx_opt,
if(n_bin > 1) {

PCTInfo pct_mean;
compute_pct_mean(pct_info, n_bin, pct_mean, sum_total);

// For non-CDP thresholds, sum the total counts
compute_pct_mean(pct_info, n_bin, pct_mean, !cdp_thresh);

// For CDP thresholds, reset the OBS_THRESH column to ==1/n_bin
// to indicate the number of climatological bins used
if(cdp_thresh) {
pct_mean.othresh.set((double) 100.0/vx_opt.cdf_info.n_bin,
thresh_eq, perc_thresh_climo_dist);
}

// Write out PSTD
if(vx_opt.output_flag[i_pstd] != STATOutputType_None) {
Expand Down