From c42d5004f43e845ec75129066a5f584498a6d68f Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Thu, 18 Feb 2021 16:13:23 -0700 Subject: [PATCH] Per #1451, the ECNT line type will no longer be written separately for each CDF bin. Removing the bin-related arguments from the write_ecnt functions. --- met/src/libcode/vx_stat_out/stat_columns.cc | 13 +------------ met/src/libcode/vx_stat_out/stat_columns.h | 2 +- met/src/tools/core/point_stat/point_stat.cc | 2 +- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/met/src/libcode/vx_stat_out/stat_columns.cc b/met/src/libcode/vx_stat_out/stat_columns.cc index 570977fb17..ce40031c2c 100644 --- a/met/src/libcode/vx_stat_out/stat_columns.cc +++ b/met/src/libcode/vx_stat_out/stat_columns.cc @@ -1600,10 +1600,9 @@ void write_isc_row(StatHdrColumns &shc, const ISCInfo &isc_info, //////////////////////////////////////////////////////////////////////// void write_ecnt_row(StatHdrColumns &shc, const ECNTInfo &ecnt_info, - STATOutputType out_type, int i_bin, int n_bin, + STATOutputType out_type, AsciiTable &stat_at, int &stat_row, AsciiTable &txt_at, int &txt_row) { - ConcatString mask_name = shc.get_mask(); // ECNT line type shc.set_line_type(stat_ecnt_str); @@ -1617,10 +1616,6 @@ void write_ecnt_row(StatHdrColumns &shc, const ECNTInfo &ecnt_info, shc.set_cov_thresh(na_str); shc.set_alpha(bad_data_double); - // Update the mask name, if needed. - ConcatString cs = append_climo_bin(mask_name, i_bin, n_bin); - shc.set_mask(cs.c_str()); - // Write the header columns write_header_cols(shc, stat_at, stat_row); @@ -1638,9 +1633,6 @@ void write_ecnt_row(StatHdrColumns &shc, const ECNTInfo &ecnt_info, // Increment the STAT row counter stat_row++; - // Reset the mask name - shc.set_mask(mask_name.c_str()); - return; } @@ -1681,9 +1673,6 @@ void write_rps_row(StatHdrColumns &shc, const RPSInfo &rps_info, // Increment the STAT row counter stat_row++; - // Reset the mask name - shc.set_mask(mask_name.c_str()); - return; } diff --git a/met/src/libcode/vx_stat_out/stat_columns.h b/met/src/libcode/vx_stat_out/stat_columns.h index c56686bf71..f5db8bb977 100644 --- a/met/src/libcode/vx_stat_out/stat_columns.h +++ b/met/src/libcode/vx_stat_out/stat_columns.h @@ -107,7 +107,7 @@ extern void write_mpr_row (StatHdrColumns &, const PairDataPoint *, STATOutput extern void write_isc_row (StatHdrColumns &, const ISCInfo &, STATOutputType, AsciiTable &, int &, AsciiTable &, int &); extern void write_ecnt_row (StatHdrColumns &, const ECNTInfo &, STATOutputType, - int, int, AsciiTable &, int &, AsciiTable &, int &); + AsciiTable &, int &, AsciiTable &, int &); extern void write_rps_row (StatHdrColumns &, const RPSInfo &, STATOutputType, AsciiTable &, int &, AsciiTable &, int &); extern void write_rhist_row (StatHdrColumns &, const PairDataEnsemble *, STATOutputType, diff --git a/met/src/tools/core/point_stat/point_stat.cc b/met/src/tools/core/point_stat/point_stat.cc index 664243a721..c4b6187630 100644 --- a/met/src/tools/core/point_stat/point_stat.cc +++ b/met/src/tools/core/point_stat/point_stat.cc @@ -1832,7 +1832,7 @@ void do_hira_ens(int i_vx, const PairDataPoint *pd_ptr) { write_ecnt_row(shc, ecnt_info, conf_info.vx_opt[i_vx].output_flag[i_ecnt], - 0, 1, stat_at, i_stat_row, + stat_at, i_stat_row, txt_at[i_ecnt], i_txt_row[i_ecnt]); } // end if ECNT