Skip to content

Commit

Permalink
Update main_v9.1-ref after #1709 and #1711 (v9.1.2) (#1713)
Browse files Browse the repository at this point in the history
* Add debug level 4 message to list out the number of GRIB2 records inventoried. This helps debugging issues with MET potentially not reading all input GRIB2 records on WCOSS.

* Bugfix 1554 main_v9.1 ncdump (#1555)

* Bugfix 1562 main_v9.1 grid_diag (#1563)

* Per #1562, check for bad data values before adding data to the PDF's for grid_diag.

* Per #1562, removing the poly = CONUS.poly mask from GridDiagConfig_TMP. That settting masked a problem in the handling of missing data. Exercising the mask.poly option is tested in another unit test. This will change the output and break the nightly build, but that's good since we'll do more thorough testing.

* Per #1508, change the verbosity in unit_tc_gen.xml from -v 2 to -v 5 to print out some additional log messages that may help in debugging the intermittent file list failure.

* Feature 1572 v9.1.1 (#1573)

* Per #1572, delete the docs/version file as it is not needed here.

* Per #1572, update the version number to 9.1.1.

* Per #1572, list the met-9.1.1 release date as 20201119 for the docs.

* Per #1572, add release notes for the met-9.1.1 verison.

* Per #1572, add release notes for met-9.1.1 version.

* Per #1572, let's try to release met-9.1.1 today 11/18.

* Correct GitHub link.

* Fix small typo in release notes.

* Bugfix 1618 main v91 pb2nc (#1622)

Co-authored-by: Howard Soh <hsoh@kiowa.rap.ucar.edu>

* Update pull_request_template.md

* Per #1638, apply the same 3 fixes to the main_v9.1 branch to be included in the next bugfix release for met-9.1. (#1640)

* Per #1646, one line fix for cut-and-paste error. (#1648)

* Adding necessary files for ReadTheDocs (#1703)

* Per #1706, update aggr_ecnt_lines() to also add an entry to the skip_ba array of booleans. This is used to keep track of whether or not the point should be excluded from the statistics and is used in the Ensemble-Stat. This same aggregation code in the vx_statistics library is used by Stat-Analysis. Since Stat-Analysis failed to populate that array, it led to an array parsing error in ECNTInfo::set() when trying to compute the sum of the weights. (#1707)

* Per #1694, exactly the same set of bugfix changes but applied to main_v9.1 rather than the develop branch. (#1709)

* Feature 1710 v9.1.2 (#1711)

* Per #1710, update the release notes and version numbers for the 9.1.2 release.

* Per #1710, add a release note about the move to read the docs.

Co-authored-by: hsoh-u <hsoh@ucar.edu>
Co-authored-by: Howard Soh <hsoh@kiowa.rap.ucar.edu>
Co-authored-by: jprestop <jpresto@ucar.edu>
  • Loading branch information
4 people authored Mar 12, 2021
1 parent 97edc2d commit 2112920
Show file tree
Hide file tree
Showing 10 changed files with 168 additions and 89 deletions.
23 changes: 23 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# .readthedocs.yaml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Build all formats (htmlzip, pdf, epub)
#formats: all
formats: []

# Optionally set the version of Python and requirements required to build your
# docs
python:
version: 3.7
install:
- requirements: met/docs/requirements.txt

# Configuration for Sphinx documentation (this is the default documentation
# type)
sphinx:
builder: html
configuration: met/docs/conf.py
13 changes: 12 additions & 1 deletion met/docs/Users_Guide/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,18 @@ When applicable, release notes are followed by the GitHub issue number which
describes the bugfix, enhancement, or new feature:
https://github.com/dtcenter/MET/issues

Version |version| release notes (|release_date|)
Version 9.1.2 release notes (20210310)
------------------------------------------------

- See complete list of `GitHub Issues <https://github.com/NCAR/MET/milestone/70?closed=1>`_.
- Enable the MET documentation to be published via `Read the Docs <https://met.readthedocs.io/en/latest/>`_.
- Fix sporadic PB2NC segfaults for the -index command line option (`#1618 <http://github.com/dtcenter/MET/issues/1618>`_).
- Correct the climatological CDF value reported by Grid-Stat (`#1638 <http://github.com/dtcenter/MET/issues/1638>`_).
- The set_attr_accum option sets the lead time instead of the accumulation time (`#1646 <http://github.com/dtcenter/MET/issues/1646>`_).
- Stat-Analysis fails when aggregating ECNT line from Ensemble-Stat (`#1706 <http://github.com/dtcenter/MET/issues/1706>`_).
- The 1D histograms reported by Grid-Diag are incorrect when reading the same variable name from multiple data sources (`#1694 <http://github.com/dtcenter/MET/issues/1694>`_).

Version 9.1.1 release notes (20201118)
------------------------------------------------

- See complete list of `GitHub Issues <https://github.com/NCAR/MET/milestone/68?closed=1>`_.
Expand Down
6 changes: 3 additions & 3 deletions met/docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
project = 'MET'
author = 'UCAR/NCAR, NOAA, CSU/CIRA, and CU/CIRES'
author_list = 'Brown, B., Bullock, R., Fowler, T., Halley Gotway, J., Newman, K., Jensen, T.'
version = '9.1.1'
version = '9.1.2'
verinfo = version
release = f'{version}'
release_year = '2020'
release_date = f'{release_year}1118'
release_year = '2021'
release_date = f'{release_year}0310'
copyright = f'{release_year}, {author}'

# -- General configuration ---------------------------------------------------
Expand Down
10 changes: 10 additions & 0 deletions met/docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
sphinx==2.4.4
sphinx-gallery==0.7.0
sphinx-rtd-theme==0.4.3
sphinxcontrib-applehelp==1.0.2
sphinxcontrib-bibtex
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==1.0.3
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.4
3 changes: 2 additions & 1 deletion met/src/basic/vx_util/util_constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////

// Released versions of MET
static const char met_version_9_1_2[] = "V9.1.2";
static const char met_version_9_1_1[] = "V9.1.1";
static const char met_version_9_1[] = "V9.1";
static const char met_version_9_0[] = "V9.0";
Expand All @@ -39,7 +40,7 @@ static const char met_version_1_1[] = "V1.1";

////////////////////////////////////////////////////////////////////////

static const char * const met_version = met_version_9_1_1;
static const char * const met_version = met_version_9_1_2;
static const char default_met_data_dir[] = "MET_BASE";
static const char txt_file_ext[] = ".txt";
static const char stat_file_ext[] = ".stat";
Expand Down
2 changes: 1 addition & 1 deletion met/src/libcode/vx_data2d/data2d_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ void set_attrs(const VarInfo *info, DataPlane &dp) {
mlog << Debug(3) << "Resetting accumulation interval from "
<< sec_to_hhmmss(dp.accum()) << " to "
<< sec_to_hhmmss(info->accum_attr()) << ".\n";
dp.set_lead(info->accum_attr());
dp.set_accum(info->accum_attr());
}

return;
Expand Down
13 changes: 13 additions & 0 deletions met/src/libcode/vx_data2d/var_info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,19 @@ void VarInfo::set_magic(const ConcatString &nstr, const ConcatString &lstr) {

///////////////////////////////////////////////////////////////////////////////

ConcatString VarInfo::magic_str_attr() const {
ConcatString mstr(name_attr());
ConcatString lstr(level_attr());

// Format as {name}/{level} or {name}{level}
if(lstr.nonempty() && lstr[0] != '(') mstr << "/";
mstr << lstr;

return(mstr);
}

///////////////////////////////////////////////////////////////////////////////

void VarInfo::set_dict(Dictionary &dict) {
ThreshArray ta;
NumArray na;
Expand Down
1 change: 1 addition & 0 deletions met/src/libcode/vx_data2d/var_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ class VarInfo

RegridInfo regrid() const;

ConcatString magic_str_attr() const;
ConcatString name_attr() const;
ConcatString units_attr() const;
ConcatString level_attr() const;
Expand Down
1 change: 1 addition & 0 deletions met/src/tools/core/stat_analysis/aggr_stat_line.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2577,6 +2577,7 @@ void aggr_ecnt_lines(LineDataFile &f, STATAnalysisJob &job,
m[key].ens_pd.var_oerr_na.add(square(cur.spread_oerr));
m[key].ens_pd.var_plus_oerr_na.add(square(cur.spread_plus_oerr));
m[key].ens_pd.wgt_na.add(cur.total);
m[key].ens_pd.skip_ba.add(false);

//
// Store the summary statistics
Expand Down
Loading

0 comments on commit 2112920

Please sign in to comment.