Update develop-ref after #2082

met/docs/Users_Guide/release-notes.rst

@@ -5,6 +5,49 @@ When applicable, release notes are followed by the GitHub issue number which
 describes the bugfix, enhancement, or new feature:
 `MET GitHub issues. <https://github.com/dtcenter/MET/issues>`_
 
+MET Version 10.1.0-beta6 release notes (20220302)
+-------------------------------------------------
+
+* Enhancements:
+
+   * **Enhance Ensemble-Stat to compute probabilistic statistics for user-defined or climatology-based thresholds** (`#1259 <https://github.com/dtcenter/MET/issues/1259>`_).
+   * **Enhance Ensemble-Stat to apply the HiRA method to ensembles** (`#1583 <https://github.com/dtcenter/MET/issues/1583>`_ and `#2045 <https://github.com/dtcenter/MET/issues/2045>`_).
+   * **Enhance Ensemble-Stat, Point-Stat, Plot-Point-Obs, and Point2Grid to support python embedding of point observations** (`#1844 <https://github.com/dtcenter/MET/issues/1844>`_).
+   * **Enhance Gen-Ens-Prod to standardize ensemble members relative to climatology** (`#1918 <https://github.com/dtcenter/MET/issues/1918>`_).
+   * Enhance PB2NC to derive Mixed-Layer CAPE (MLCAPE) (`#1824 <https://github.com/dtcenter/MET/issues/1824>`_).
+   * Enhance Series-Analysis to compute the BRIERCL statistic from the PSTD line type (`#2003 <https://github.com/dtcenter/MET/issues/2003>`_).
+   * Enhance the MET library code to read Rotated Lat/Lon data from CF-compliant NetCDF files (`#1055 <https://github.com/dtcenter/MET/issues/1055>`_).
+
+* Configuration:
+
+   * Update the PB2NC configuration to correct the obs_prefbufr_map name as obs_prepbufr_map (`#2044 <https://github.com/dtcenter/MET/issues/2044>`_).
+   * Add entries to the default obs_prepbufr_map setting (`#2070 <https://github.com/dtcenter/MET/issues/2070>`_).
+
+* Bugfixes:
+
+   * Fix the MET library code to correclty parse timing information from Grid-Stat NetCDF matched pairs output files (`#2040 <https://github.com/dtcenter/MET/issues/2040>`_).
+   * Fix MADIS2NC to correctly parse MADIS profiler quality flag values (`#2028 <https://github.com/dtcenter/MET/issues/2028>`_).
+
+* Testing:
+
+   * **Implement Continuous Integration with GH-Actions in MET** (`#1546 <https://github.com/dtcenter/MET/issues/1546>`_).
+   * Write a script to automate SonarQube static code analysis runs in the nightly build (`#2020 <https://github.com/dtcenter/MET/issues/2020>`_).
+   * Investigate nightly build output wind direction differences caused by machine precision (`#2027 <https://github.com/dtcenter/MET/issues/2027>`_).
+
+* Logging:
+
+   * Enhance PB2NC to reduce redundant verbosity level 3 log messages (`#2015 <https://github.com/dtcenter/MET/issues/2015>`_).
+   * Print a warning message about switching from Ensemble-Stat to Gen-Ens-Prod (`#1907 <https://github.com/dtcenter/MET/issues/1907>`_).
+   * Update error messages to redirect users from the MET-Help desk to METplus Discussions (`#2054 <https://github.com/dtcenter/MET/issues/2054>`_).
+
+* Repository and installation:
+
+   * Update the copyright year of the source code to 2022 (`#2013 <https://github.com/dtcenter/MET/issues/2013>`_).
+
+* Documentation:
+
+   * Enhance the documentation to follow the standard for sections (`#1998 <https://github.com/dtcenter/MET/issues/1998>`_).
+
 MET Version 10.1.0-beta5 release notes (20220114)
 -------------------------------------------------
 

met/docs/conf.py

@@ -20,11 +20,11 @@
 project = 'MET'
 author = 'UCAR/NCAR, NOAA, CSU/CIRA, and CU/CIRES'
 author_list = 'Halley Gotway, J., K. Newman, H. Soh, J. Opatz, T. Jensen, J. Prestopnik, L. Goodrich, D. Fillmore, B. Brown, R. Bullock, T. Fowler'
-version = '10.1.0-beta5'
+version = '10.1.0-beta6'
 verinfo = version
 release = f'{version}'
 release_year = '2022'
-release_date = f'{release_year}-01-14'
+release_date = f'{release_year}-03-02'
 copyright = f'{release_year}, {author}'
 
 # -- General configuration ---------------------------------------------------

met/src/tools/core/ensemble_stat/ensemble_stat.cc

@@ -2618,7 +2618,7 @@ void do_pct_cat_thresh(const EnsembleStatVxOpt &vx_opt,
       } // end for i_bin
 
       // Write the probabilistic output
-      write_pct_info(vx_opt, pct_info, n_bin, true);
+      write_pct_info(vx_opt, pct_info, n_bin, false);
 
    } // end for i_ta
 
@@ -2708,7 +2708,7 @@ void do_pct_cdp_thresh(const EnsembleStatVxOpt &vx_opt,
    } // end for i_bin
 
    // Write the probabilistic output
-   write_pct_info(vx_opt, pct_info, n_bin, false);
+   write_pct_info(vx_opt, pct_info, n_bin, true);
 
    // Dealloate memory
    if(pct_info) { delete [] pct_info; pct_info = (PCTInfo *) 0; }
@@ -2720,7 +2720,7 @@ void do_pct_cdp_thresh(const EnsembleStatVxOpt &vx_opt,
 
 void write_pct_info(const EnsembleStatVxOpt &vx_opt,
                     const PCTInfo *pct_info, int n_bin,
-                    bool sum_total) {
+                    bool cdp_thresh) {
 
    // Write output for each bin
    for(int i_bin=0; i_bin<n_bin; i_bin++) {
@@ -2776,7 +2776,16 @@ void write_pct_info(const EnsembleStatVxOpt &vx_opt,
    if(n_bin > 1) {
 
       PCTInfo pct_mean;
-      compute_pct_mean(pct_info, n_bin, pct_mean, sum_total);
+
+      // For non-CDP thresholds, sum the total counts
+      compute_pct_mean(pct_info, n_bin, pct_mean, !cdp_thresh);
+
+      // For CDP thresholds, reset the OBS_THRESH column to ==1/n_bin
+      // to indicate the number of climatological bins used
+      if(cdp_thresh) {
+         pct_mean.othresh.set((double) 100.0/vx_opt.cdf_info.n_bin,
+                              thresh_eq, perc_thresh_climo_dist);
+      }
 
       // Write out PSTD
       if(vx_opt.output_flag[i_pstd] != STATOutputType_None) {