Updated develop-ref after #2272 (#2284)

Co-authored-by: jprestop <jpresto@ucar.edu> Co-authored-by: Julie Prestopnik <jpresto@seneca.rap.ucar.edu> Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com> Co-authored-by: Randy Bullock <bullock@seneca.rap.ucar.edu> Co-authored-by: davidfillmore <fillmore.winslow.david@gmail.com> Co-authored-by: rgbullock <bullock@ucar.edu> Co-authored-by: John Halley Gotway <johnhg@kiowa.rap.ucar.edu> Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> Co-authored-by: johnhg <johnhg@ucar.edu> Co-authored-by: John Halley Gotway <johnhg@ucar.edu> Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu> Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: Seth Linden <linden@kiowa.rap.ucar.edu> Co-authored-by: Howard Soh <hsoh@kiowa.rap.ucar.edu> Co-authored-by: Seth Linden <linden@ucar.edu> Co-authored-by: hsoh-u <hsoh@ucar.edu> Co-authored-by: John Halley Gotway <johnhg@seneca.rap.ucar.edu> Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu> Co-authored-by: mo-mglover <78152252+mo-mglover@users.noreply.github.com> Co-authored-by: davidalbo <dave@ucar.edu> Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com> Co-authored-by: Dan Adriaansen <dadriaan@ucar.edu> Co-authored-by: Dave Albo <dave@seneca.rap.ucar.edu> Co-authored-by: Lisa Goodrich <lisag@seneca.rap.ucar.edu> Co-authored-by: Molly Smith <molly.b.smith@noaa.gov> Co-authored-by: Jonathan Vigh <jvigh@ucar.edu> Co-authored-by: bikegeek <3753118+bikegeek@users.noreply.github.com>
dtcenter · Sep 28, 2022 · 59892e8 · 59892e8
1 parent f9dc013
commit 59892e8
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 16 deletions.
diff --git a/docs/Users_Guide/release-notes.rst b/docs/Users_Guide/release-notes.rst
@@ -5,6 +5,36 @@ When applicable, release notes are followed by the GitHub issue number which des
 enhancement, or new feature (`MET GitHub issues <https://github.com/dtcenter/MET/issues>`_).
 Important issues are listed **in bold** for emphasis.
 
+MET Version 11.0.0-beta3 release notes (20220921)
+-------------------------------------------------
+
+.. warning:: **Ensemble post-processing was added to Gen-Ens-Prod in version 10.1.0 and will be removed from Ensemble-Stat in version 11.0.0!**
+
+* Repository and build:
+
+   * Add initial files to create the MET compilation environment in the dtcenter/met-base Docker image (`dtcenter/METbaseimage#1 <https://github.com/dtcenter/METbaseimage/issues/1>`_).
+   * Update the METbaseimage to install Python 3.8.6 from source (`dtcenter/METbaseimage#3 <https://github.com/dtcenter/METbaseimage/issues/3>`_).
+   * Restructure the MET Dockerfiles to create images based on the new METbaseimage (`#2196 <https://github.com/dtcenter/MET/issues/2196>`_).
+   * Add .zenodo.json file to add metadata about releases (`#2198 <https://github.com/dtcenter/MET/issues/2198>`_).
+
+* Bugfixes:
+
+   * Fix the truncated station_id name in the output from IODA2NC (`#2216 <https://github.com/dtcenter/MET/issues/2216>`_).
+   * Fix oom() compile time linker error (`#2238 <https://github.com/dtcenter/MET/issues/2238>`_).
+   * Store unspecified accumulation interval as 0 rather than bad data (`#2250 <https://github.com/dtcenter/MET/issues/2250>`_).
+
+* Enhancements:
+
+   * **Remove ensemble post-processing from the Ensemble-Stat tool** (`#1908 <https://github.com/dtcenter/MET/issues/1908>`_).
+   * **Enhance Point-Stat to compute SEEPS for point observations and write new SEEPS and SEEPS_MPR STAT line types** (`#1942 <https://github.com/dtcenter/MET/issues/1942>`_).
+   * **Add the fair CRPS statistic to the ECNT line type in a new CRPS_EMP_FAIR column** (`#2206 <https://github.com/dtcenter/MET/issues/2206>`_).
+   * Update map data with more recent NaturalEarth definitions (`#2207 <https://github.com/dtcenter/MET/issues/2207>`_).
+   * Define new grid class to store semi-structured grid information (e.g. lat or lon vs level or time) (`#1954 <https://github.com/dtcenter/MET/issues/1954>`_).
+   * Add support for EPA AirNow ASCII data in ASCII2NC (`#2142 <https://github.com/dtcenter/MET/issues/2142>`_).
+   * Add tmp_dir configuration option to the Plot-Point-Obs tool (`#2237 <https://github.com/dtcenter/MET/issues/2237>`_).
+   * Refine NetCDF level string handling logic to always interpret @ strings as values (`#2225 <https://github.com/dtcenter/MET/issues/2225>`_).
+   * Add support for reading National Blend Model GRIB2 data (`#2055 <https://github.com/dtcenter/MET/issues/2055>`_).
+
 MET Version 11.0.0-beta2 release notes (20220809)
 -------------------------------------------------
 
@@ -22,6 +52,7 @@ MET Version 11.0.0-beta2 release notes (20220809)
    * Add a sum option to the time summaries computed by the point pre-processing tools (`#2204 <https://github.com/dtcenter/MET/issues/2204>`_).
    * Refine warning/error messages when parsing thresholds (`#2211 <https://github.com/dtcenter/MET/issues/2211>`_).
    * Add "station_ob" to metadata_map as a message_type metadata variable for ioda2nc (`#2215 <https://github.com/dtcenter/MET/issues/2215>`_).
+   * MET: Add a timestamp to the log output at the beginning and end of each MET tool run (`dtcenter/METplus-Internal#18 <https://github.com/dtcenter/METplus-Internal/issues/18>`_).
    * MET: Add the user ID and the command line being executed to the log output at beginning and end of each MET tool run (`dtcenter/METplus-Internal#19 <https://github.com/dtcenter/METplus-Internal/issues/19>`_).
    * MET: Enhance MET to have better signal handling for shutdown events (`dtcenter/METplus-Internal#21 <https://github.com/dtcenter/METplus-Internal/issues/21>`_).
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -20,11 +20,11 @@
 project = 'MET'
 author = 'UCAR/NCAR, NOAA, CSU/CIRA, and CU/CIRES'
 author_list = 'Opatz, J., T. Jensen, J. Prestopnik, H. Soh, L. Goodrich, B. Brown, R. Bullock, J. Halley Gotway, K. Newman'
-version = '11.0.0-beta2'
+version = '11.0.0-beta3'
 verinfo = version
 release = f'{version}'
 release_year = '2022'
-release_date = f'{release_year}-08-09'
+release_date = f'{release_year}-09-21'
 copyright = f'{release_year}, {author}'
 
 # -- General configuration ---------------------------------------------------

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;

diff --git a/src/libcode/vx_grid/Makefile.in b/src/libcode/vx_grid/Makefile.in
@@ -146,9 +146,9 @@ am__depfiles_remade = ./$(DEPDIR)/libvx_grid_a-earth_rotation.Po \
 	./$(DEPDIR)/libvx_grid_a-lc_grid.Po \
 	./$(DEPDIR)/libvx_grid_a-merc_grid.Po \
 	./$(DEPDIR)/libvx_grid_a-rot_latlon_grid.Po \
+	./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po \
 	./$(DEPDIR)/libvx_grid_a-st_grid.Po \
-	./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po \
-	./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po
+	./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po
 am__mv = mv -f
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -437,9 +437,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-lc_grid.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-merc_grid.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-rot_latlon_grid.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-st_grid.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po@am__quote@ # am--include-marker
 
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
@@ -778,9 +778,9 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/libvx_grid_a-lc_grid.Po
 	-rm -f ./$(DEPDIR)/libvx_grid_a-merc_grid.Po
 	-rm -f ./$(DEPDIR)/libvx_grid_a-rot_latlon_grid.Po
+	-rm -f ./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po
 	-rm -f ./$(DEPDIR)/libvx_grid_a-st_grid.Po
 	-rm -f ./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po
-	-rm -f ./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -836,9 +836,9 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/libvx_grid_a-lc_grid.Po
 	-rm -f ./$(DEPDIR)/libvx_grid_a-merc_grid.Po
 	-rm -f ./$(DEPDIR)/libvx_grid_a-rot_latlon_grid.Po
+	-rm -f ./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po
 	-rm -f ./$(DEPDIR)/libvx_grid_a-st_grid.Po
 	-rm -f ./$(DEPDIR)/libvx_grid_a-tcrmw_grid.Po
-	-rm -f ./$(DEPDIR)/libvx_grid_a-semilatlon_grid.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic