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

Jump to bottom

Bugfix #2271 develop nbrctc #2272

Merged
merged 2 commits into from
Sep 28, 2022
Merged

Bugfix #2271 develop nbrctc #2272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bd9147
fixed bug discovered in dtcenter/METplus#1826 where incorrect number …
georgemccabe Sep 22, 2022
d532b2c
Per #2271, tweaking an existing Stat-Analysis unit test to demonstrat…
JohnHalleyGotway Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions internal/test_unit/config/STATAnalysisConfig_grid_stat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ obtype = [];

vx_mask = [ "DTC165", "DTC166" ];

interp_mthd = [ "UW_MEAN_SQUARE" ];
interp_mthd = [];

interp_pnts = [ 9 ];
interp_pnts = [];

fcst_thresh = [];
obs_thresh = [];
Expand All @@ -71,10 +71,11 @@ weight = [];
// Array of STAT-Analysis jobs to be performed on the filtered data
//
jobs = [
"-job filter -line_type CNT -fcst_thresh NA -alpha 0.05 -dump_row ${OUTPUT_DIR}/CONFIG_GRID_STAT_filter.stat",
"-job aggregate_stat -line_type SL1L2 -fcst_thresh NA -out_line_type CNT -dump_row ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_stat_sl1l2_dump.stat -out_stat ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_stat_sl1l2_out.stat -set_hdr VX_MASK CONUS",
"-job aggregate -line_type CTC -fcst_thresh \<273 -dump_row ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_ctc_dump.stat -out_stat ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_ctc_out.stat -set_hdr VX_MASK CONUS",
"-job aggregate_stat -line_type CTC -out_line_type ECLV -fcst_thresh \<273 -dump_row ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_stat_ctc_to_eclv_dump.stat -out_stat ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_stat_ctc_to_eclv_out.stat -set_hdr VX_MASK CONUS"
"-job filter -line_type CNT -fcst_thresh NA -alpha 0.05 -interp_mthd UW_MEAN_SQUARE -interp_pnts 9 -dump_row ${OUTPUT_DIR}/CONFIG_GRID_STAT_filter.stat",
"-job aggregate_stat -line_type SL1L2 -fcst_thresh NA -out_line_type CNT -by INTERP_MTHD,INTERP_PNTS -dump_row ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_stat_sl1l2_dump.stat -out_stat ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_stat_sl1l2_out.stat -set_hdr VX_MASK CONUS",
"-job aggregate -line_type CTC -by INTERP_MTHD,INTERP_PNTS,FCST_THRESH -dump_row ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_ctc_dump.stat -out_stat ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_ctc_out.stat -set_hdr VX_MASK CONUS",
"-job aggregate_stat -line_type CTC -out_line_type ECLV -by INTERP_MTHD,INTERP_PNTS,FCST_THRESH -dump_row ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_stat_ctc_to_eclv_dump.stat -out_stat ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_stat_ctc_to_eclv_out.stat -set_hdr VX_MASK CONUS",
"-job aggregate -line_type NBRCTC -by INTERP_MTHD,INTERP_PNTS,FCST_THRESH -dump_row ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_nbrctc_dump.stat -out_stat ${OUTPUT_DIR}/CONFIG_GRID_STAT_agg_nbrctc_out.stat -set_hdr VX_MASK CONUS"
];

////////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 2 additions & 0 deletions internal/test_unit/xml/unit_stat_analysis_gs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
<stat>&OUTPUT_DIR;/stat_analysis_gs/CONFIG_GRID_STAT_agg_ctc_out.stat</stat>
<stat>&OUTPUT_DIR;/stat_analysis_gs/CONFIG_GRID_STAT_agg_stat_ctc_to_eclv_dump.stat</stat>
<stat>&OUTPUT_DIR;/stat_analysis_gs/CONFIG_GRID_STAT_agg_stat_ctc_to_eclv_out.stat</stat>
<stat>&OUTPUT_DIR;/stat_analysis_gs/CONFIG_GRID_STAT_agg_nbrctc_dump.stat</stat>
<stat>&OUTPUT_DIR;/stat_analysis_gs/CONFIG_GRID_STAT_agg_nbrctc_out.stat</stat>
</output>
</test>

Expand Down
6 changes: 3 additions & 3 deletions src/libcode/vx_analysis_util/stat_job.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2046,9 +2046,9 @@ void STATAnalysisJob::setup_stat_file(int n_row, int n) {
case stat_prc: write_prc_header_row (1, n, stat_at, 0, 0); break;
case stat_eclv: write_eclv_header_row (1, n, stat_at, 0, 0); break;
case stat_mpr: write_header_row (mpr_columns, n_mpr_columns, 1, stat_at, 0, 0); break;
case stat_nbrctc: write_header_row (nbrctc_columns, n_sl1l2_columns, 1, stat_at, 0, 0); break;
case stat_nbrcts: write_header_row (nbrcts_columns, n_sl1l2_columns, 1, stat_at, 0, 0); break;
case stat_nbrcnt: write_header_row (nbrcnt_columns, n_sl1l2_columns, 1, stat_at, 0, 0); break;
case stat_nbrctc: write_header_row (nbrctc_columns, n_nbrctc_columns, 1, stat_at, 0, 0); break;
case stat_nbrcts: write_header_row (nbrcts_columns, n_nbrcts_columns, 1, stat_at, 0, 0); break;
case stat_nbrcnt: write_header_row (nbrcnt_columns, n_nbrcnt_columns, 1, stat_at, 0, 0); break;
case stat_grad: write_header_row (grad_columns, n_grad_columns, 1, stat_at, 0, 0); break;
case stat_isc: write_header_row (isc_columns, n_isc_columns, 1, stat_at, 0, 0); break;
case stat_wdir: write_header_row (job_wdir_columns, n_job_wdir_columns, 1, stat_at, 0, 0); break;
Expand Down