Bugfix #2271 develop nbrctc (#2272)

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
dtcenter · Sep 28, 2022 · 1d80bdd · 1d80bdd
1 parent 3821152
commit 1d80bdd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/internal/test_unit/config/STATAnalysisConfig_grid_stat b/internal/test_unit/config/STATAnalysisConfig_grid_stat
@@ -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  = [];
@@ -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"
 ];
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/internal/test_unit/xml/unit_stat_analysis_gs.xml b/internal/test_unit/xml/unit_stat_analysis_gs.xml
@@ -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>
 

diff --git a/src/libcode/vx_analysis_util/stat_job.cc b/src/libcode/vx_analysis_util/stat_job.cc
@@ -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;