From 39fa8bc3cc44f7192977859fe2adc83c46a2e7e4 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Mon, 27 Sep 2021 14:43:46 -0600 Subject: [PATCH] Per #1904, update Grid-Stat, Ensemlbe-Stat, and Gen-Ens-Prod to pass climo data to the fractional_coverage() function. --- met/src/tools/core/ensemble_stat/ensemble_stat.cc | 3 ++- met/src/tools/core/grid_stat/grid_stat.cc | 2 ++ met/src/tools/other/gen_ens_prod/gen_ens_prod.cc | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/met/src/tools/core/ensemble_stat/ensemble_stat.cc b/met/src/tools/core/ensemble_stat/ensemble_stat.cc index eecc5c183f..2c56e017b6 100644 --- a/met/src/tools/core/ensemble_stat/ensemble_stat.cc +++ b/met/src/tools/core/ensemble_stat/ensemble_stat.cc @@ -2058,7 +2058,8 @@ void track_counts(int i_vx, const DataPlane &dp) { fractional_coverage(dp, frac_dp, conf_info.nbrhd_prob.width[j], conf_info.nbrhd_prob.shape, - ThreshBuf[i], conf_info.nbrhd_prob.vld_thresh); + ThreshBuf[i], (const DataPlane *) 0, (const DataPlane *) 0, + conf_info.nbrhd_prob.vld_thresh); // Increment counts const double *Frac = frac_dp.data(); diff --git a/met/src/tools/core/grid_stat/grid_stat.cc b/met/src/tools/core/grid_stat/grid_stat.cc index 242a3de5e3..70c40bb655 100644 --- a/met/src/tools/core/grid_stat/grid_stat.cc +++ b/met/src/tools/core/grid_stat/grid_stat.cc @@ -1393,6 +1393,7 @@ void process_scores() { fractional_coverage(fcst_dp, fcst_dp_smooth, nbrhd->width[j], nbrhd->shape, conf_info.vx_opt[i].fcat_ta[k], + &cmn_dp, &csd_dp, nbrhd->vld_thresh); // Compute the binary threshold field @@ -1431,6 +1432,7 @@ void process_scores() { fractional_coverage(obs_dp, obs_dp_smooth, nbrhd->width[j], nbrhd->shape, conf_info.vx_opt[i].ocat_ta[k], + &cmn_dp, &csd_dp, nbrhd->vld_thresh); // Compute the binary threshold field diff --git a/met/src/tools/other/gen_ens_prod/gen_ens_prod.cc b/met/src/tools/other/gen_ens_prod/gen_ens_prod.cc index ed4640685c..7574b39700 100644 --- a/met/src/tools/other/gen_ens_prod/gen_ens_prod.cc +++ b/met/src/tools/other/gen_ens_prod/gen_ens_prod.cc @@ -487,7 +487,8 @@ void track_counts(int i_var, const DataPlane &ens_dp, bool is_ctrl, fractional_coverage(ens_dp, frac_dp, conf_info.nbrhd_prob.width[j], conf_info.nbrhd_prob.shape, - thr_buf[i], conf_info.nbrhd_prob.vld_thresh); + thr_buf[i], &cmn_dp, &csd_dp, + conf_info.nbrhd_prob.vld_thresh); // Increment counts for(k=0; k