Update develop-ref after #1979 (#1981)

Co-authored-by: Julie Prestopnik <[email protected]> Co-authored-by: johnhg <[email protected]> Co-authored-by: Seth Linden <[email protected]> Co-authored-by: John Halley Gotway <[email protected]> Co-authored-by: j-opatz <[email protected]> Co-authored-by: Howard Soh <[email protected]> Co-authored-by: jprestop <[email protected]> Co-authored-by: Seth Linden <[email protected]> Co-authored-by: hsoh-u <[email protected]>
dtcenter · Nov 23, 2021 · b4c2714 · b4c2714
1 parent 15c0acb
commit b4c2714
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 19 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,3 +1,11 @@
+## Expected Differences ##
+
+- [ ] Do these changes introduce new tools, command line arguments, or configuration file options? **[Yes or No]**</br>
+If **yes**, please describe:</br>
+
+- [ ] Do these changes modify the structure of existing or add new output data types (e.g. statistic line types or NetCDF variables)? **[Yes or No]**</br>
+If **yes**, please describe:</br>
+
 ## Pull Request Testing ##
 
 - [ ] Describe testing already performed for these changes:</br>

diff --git a/met/docs/Users_Guide/release-notes.rst b/met/docs/Users_Guide/release-notes.rst
@@ -5,8 +5,29 @@ 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-beta3 release notes (|release_date|)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+MET Version 10.1.0-beta4 release notes (20211117)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Enhancements:
+
+   * **Add logic to Ensemble-Stat to handle an ensemble control member** (`#1905 <https://github.com/dtcenter/MET/issues/1905>`_).
+   * Enhance Ensemble-Stat and Gen-Ens-Prod to error out if the control member also appears in the list of ensemble members (`#1968 <https://github.com/dtcenter/MET/issues/1968>`_).
+   * **Enhance TC-Gen to verify genesis probabilities from ATCF e-deck files** (`#1809 <https://github.com/dtcenter/MET/issues/1809>`_).
+   * Modify the STAT-Analysis GO Index configuration file (`#1945 <https://github.com/dtcenter/MET/issues/1945>`_).
+   * **Support percentile thresholds for frequency bias not equal to 1 (e.g. ==FBIAS0.9)** (`#1761 <https://github.com/dtcenter/MET/issues/1761>`_).
+   * Reimplement the NumArray class based on an STL template (`#1899 <https://github.com/dtcenter/MET/issues/1899>`_).
+
+* Bugfixes:
+
+   * Fix bug with the incrementing of numbers in temporary file names (`#1906 <https://github.com/dtcenter/MET/issues/1906>`_).
+   * Fix ascii2nc to check the return status when reading ASCII input files (`#1957 <https://github.com/dtcenter/MET/issues/1957>`_).
+
+* Documentation:
+
+   * Enhance the documentation with meta-data that is expected by MET for netCDF (`#1949 <https://github.com/dtcenter/MET/issues/1949>`_).
+
+MET Version 10.1.0-beta3 release notes (20211006)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * New tools:
 

diff --git a/met/docs/conf.py b/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-beta3'
+version = '10.1.0-beta4'
 verinfo = version
 release = f'{version}'
 release_year = '2021'
-release_date = f'{release_year}-10-06'
+release_date = f'{release_year}-11-17'
 copyright = f'{release_year}, {author}'
 
 # -- General configuration ---------------------------------------------------

diff --git a/met/src/tools/other/mode_time_domain/3d_att.cc b/met/src/tools/other/mode_time_domain/3d_att.cc
@@ -1261,7 +1261,8 @@ moments = mask.calc_3d_moments();
 
 if ( moments.N == 0 )  {
 
-   mlog << Error << "\n\n  calc_3d_single_atts() -> empty object!\n\n";
+   mlog << Error << "\n\ncalc_3d_single_atts() -> "
+        << "empty object!\n\n";
 
    exit ( 1 );
 
@@ -1322,16 +1323,22 @@ for (j=0,x_old=0,y_old=0; j<nt; ++j)  {
 
    mask.calc_2d_centroid_at_t(t, xbar_2d, ybar_2d);
 
-   if ( j == 0 )  {
+   //
+   //  distance from the old to current (x, y)
+   //
 
-       x_old = xbar_2d;
-       y_old = ybar_2d;
+   if ( j > 0 )  {
 
-   } else {
-
       dist += calc_2d_dist(xbar_2d, ybar_2d, x_old, y_old, *grid);
 
-   }   //  else
+   }
+
+   //
+   //  update old (x, y) with current
+   //
+
+   x_old = xbar_2d;
+   y_old = ybar_2d;
 
 }
 
@@ -1347,7 +1354,8 @@ values = new float [Vol];
 
 if ( !values )  {
 
-   mlog << Error << "\n\n  calc_3d_single_atts() -> memory allocation error\n\n";
+   mlog << Error << "\n\ncalc_3d_single_atts() -> "
+        << "memory allocation error\n\n";
 
    exit ( 1 );
 
@@ -1390,8 +1398,6 @@ a.Ptile_User = percentile_f(values, n, (double) (a.Ptile_Value/100.0));
 
 if ( values )  { delete [] values;  values = 0; }
 
-// a.dump(cout);
-
 return ( a );
 
 }

diff --git a/met/src/tools/other/plot_data_plane/plot_data_plane.cc b/met/src/tools/other/plot_data_plane/plot_data_plane.cc
@@ -289,7 +289,7 @@ void usage() {
         << "\t[-v level]\n\n"
 
         << "\twhere\t\"input_filename\" is the name of a "
-        << " gridded data file to be plotted (required).\n"
+        << "gridded data file to be plotted (required).\n"
 
         << "\t\t\"output_filename\" is the name of the output "
         << "PostScript file to be written (required).\n"

diff --git a/met/src/tools/tc_utils/tc_gen/tc_gen_conf_info.h b/met/src/tools/tc_utils/tc_gen/tc_gen_conf_info.h
@@ -340,10 +340,10 @@ class ProbGenPCTInfo {
    map<int,PCTInfo> PCTMap;
 
    // Map of lead times to vectors of pair info
-   map<int,vector<const ProbGenInfo *>> FcstGenMap;
-   map<int,vector<int>>                 FcstIdxMap;
-   map<int,vector<const GenesisInfo *>> BestGenMap;
-   map<int,vector<bool>>                BestEvtMap;
+   map<int,vector<const ProbGenInfo *> > FcstGenMap;
+   map<int,vector<int> >                 FcstIdxMap;
+   map<int,vector<const GenesisInfo *> > BestGenMap;
+   map<int,vector<bool> >                BestEvtMap;
 
       //////////////////////////////////////////////////////////////////