Skip to content

Commit

Permalink
Update main_v9.1-ref after #1730 (#1732)
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 <[email protected]>

* 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.

* #1715 Do not combined if there are no overlapping beteewn TQZ and UV records

* #1715 Do not combined if there are no overlapping beteewn TQZ and UV records

* #1715 Do not combined if there are no overlapping beteewn TQZ and UV records

* #1715 Added blank line for Warning

* #1715 Added a blank line for Error

* Bugfix 1716 main_v9.1 perc_thresh (#1721)

* Per #1716, committing the same bugfix to the main_v9.1 branch for inclusion in the 9.1.3 bugfix release.

* Per #1716, change SFP50 example to SFP33.3 to show an example of using floating point percentile values.

* Per #1723, update the verison number to 9.1.3. (#1730)

* Update pull_request_template.md

Co-authored-by: hsoh-u <[email protected]>
Co-authored-by: Howard Soh <[email protected]>
Co-authored-by: jprestop <[email protected]>
  • Loading branch information
@JohnHalleyGotway @hsoh-u @jprestop
4 people authored Mar 20, 2021
1 parent 2112920 commit eeecc49
Show file tree
Hide file tree
Showing 7 changed files with 121 additions and 75 deletions.
4 changes: 3 additions & 1 deletion .github/pull_request_template.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

- [ ] Recommend testing for the reviewer(s) to perform, including the location of input datasets, and any additional instructions:</br>

- [ ] Do these changes include sufficient documentation and testing updates? **[Yes or No]**
- [ ] Do these changes include sufficient documentation updates, ensuring that no errors or warnings exist in the build of the documentation? **[Yes or No]**

- [ ] Do these changes include sufficient testing updates? **[Yes or No]**

- [ ] Will this PR result in changes to the test suite? **[Yes or No]**</br>
If **yes**, describe the new output and/or changes to the existing output:</br>
Expand Down
2 changes: 1 addition & 1 deletion met/data/config/README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The configuration file language supports the following data types:
- In the Gen-Vx-Mask "-thresh" command line option.
- The following percentile threshold types are supported:
- "SFP" for a percentile of the sample forecast values.
e.g. ">SFP50" means greater than the 50-th forecast percentile.
e.g. ">SFP33.3" means greater than the 33.3-rd forecast percentile.
- "SOP" for a percentile of the sample observation values.
e.g. ">SOP75" means greater than the 75-th observation percentile.
- "SCP" for a percentile of the sample climatology values.
Expand Down
11 changes: 9 additions & 2 deletions met/docs/Users_Guide/release-notes.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@ 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 9.1.3 release notes (20210319)
--------------------------------------

- See complete list of `GitHub Issues <https://github.com/NCAR/MET/milestone/71?closed=1>`_.
- Fix PB2NC segfault when deriving PBL (`#1715 <http://github.com/dtcenter/MET/issues/1715>`_).
- Fix parsing error for floating point percentile thresholds, like >SFP33.3 (`#1716 <http://github.com/dtcenter/MET/issues/1716>`_).

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/>`_.
Expand All @@ -17,7 +24,7 @@ Version 9.1.2 release notes (20210310)
- 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>`_.
- Fix Grid-Diag to correctly ignore missing data values (`#1562 <http://github.com/dtcenter/MET/issues/1562>`_).
Expand Down
4 changes: 2 additions & 2 deletions met/docs/conf.py
View file
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.2'
version = '9.1.3'
verinfo = version
release = f'{version}'
release_year = '2021'
release_date = f'{release_year}0310'
release_date = f'{release_year}0319'
copyright = f'{release_year}, {author}'

# -- General configuration ---------------------------------------------------
Expand Down
78 changes: 40 additions & 38 deletions met/src/basic/vx_config/my_config_scanner.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,8 @@ static bool replace_env(ConcatString &);

static bool is_fort_thresh_no_spaces();

static bool is_simple_perc_thresh();

static int do_simple_perc_thresh();


Expand Down Expand Up @@ -370,6 +372,8 @@ if ( is_float_v2() ) { if ( do_float() ) return ( token(FLOAT) ); }

if ( is_fort_thresh_no_spaces() ) { return ( do_fort_thresh() ); }

if ( is_simple_perc_thresh() ) { return ( do_simple_perc_thresh() ); }

int t;

if ( is_id() ) { t = do_id(); return ( token(t) ); }
Expand Down Expand Up @@ -533,7 +537,6 @@ if ( is_lhs ) { strncpy(configlval.text, configtext, max_id_length); return (

if ( strcmp(configtext, "print" ) == 0 ) { return ( PRINT ); }


//
// boolean?
//
Expand All @@ -554,17 +557,13 @@ for (j=0; j<n_fort_thresh_strings; ++j) {

}





//
// builtin ?
//

int index;

if ( (! is_lhs) && is_builtin((string)configtext, index) ) { configlval.index = index; return ( BUILTIN ); }
if ( (! is_lhs) && is_builtin((string)configtext, index) ) { configlval.index = index; return ( BUILTIN ); }

//
// local variable ? // ie, in argument list
Expand All @@ -580,11 +579,6 @@ const DictionaryEntry * e = dict_stack->lookup(configtext);

if ( e && (e->is_number()) && (! is_lhs) ) {

// cout << "=================== id = \"" << configtext << "\" is_lhs = " << (is_lhs ? "true" : "false") << "\n";

// cout << "do_id() -> \n";
// e->dump(cout);

if ( e->type() == IntegerType ) {

set_int(configlval.nval, e->i_value());
Expand Down Expand Up @@ -613,28 +607,20 @@ if ( e && (! is_lhs) && (e->type() == UserFunctionType) ) {

}


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





//
// fortran threshold without spaces? (example: "le150")
//

if ( (strncmp(configtext, "lt", 2) == 0) && is_number(configtext + 2, max_id_length - 2) ) { return ( do_fort_thresh() ); }

for (j=0; j<n_fort_thresh_strings; ++j) {

if ( (strncmp(configtext, fort_thresh_string[j], 2) == 0)
&& (is_number(configtext + 2, max_id_length - 2))
) { configlval.cval = thresh_lt; return ( do_fort_thresh() ); }
&& (is_number(configtext + 2, max_id_length - 2)) )
{ configlval.cval = thresh_lt; return ( do_fort_thresh() ); }

}


//
// simple percentile threshold? (example: "SOP50")
//
Expand All @@ -649,11 +635,8 @@ for (j=0; j<n_perc_thresh_infos; ++j) {

}



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


//
// nope
//
Expand Down Expand Up @@ -863,7 +846,6 @@ while ( 1 ) {

c1 = c2;

// c2 = nextchar();
c2 = fgetc(configin);

}
Expand Down Expand Up @@ -891,7 +873,6 @@ while ( 1 ) {

if ( feof (configin) ) break;

// c = nextchar();
c = fgetc(configin);

if ( (c == eof) || (c == '\n') ) break;
Expand Down Expand Up @@ -1435,7 +1416,38 @@ int j;

for (j=0; j<n_fort_thresh_strings; ++j) {

if ( (strncmp(configtext, fort_thresh_string[j], 2) == 0) && (is_number(configtext + 2, max_id_length - 2)) ) return ( true );
if ( (strncmp(configtext, fort_thresh_string[j], 2) == 0)
&& (is_number(configtext + 2, max_id_length - 2)) )
{ return ( true ); }

}


return ( false );

}


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


bool is_simple_perc_thresh()

{

int j, k;

//
// simple percentile threshold? (example: "SOP50.0")
//

for (j=0; j<n_perc_thresh_infos; ++j) {

k = perc_thresh_info[j].short_name_length;

if ( (strncmp(configtext, perc_thresh_info[j].short_name, k) == 0)
&& (is_number(configtext + k, max_id_length - k)) )
{ return ( do_simple_perc_thresh() ); }

}

Expand Down Expand Up @@ -1472,7 +1484,6 @@ for (j=0; j<n_perc_thresh_infos; ++j) {

}


if ( index < 0 ) {

mlog << Error << "\ndo_simple_perc_thresh() -> "
Expand All @@ -1482,11 +1493,8 @@ if ( index < 0 ) {

}


configlval.pc_info.perc_index = index;
// configlval.pc_info.is_simple = true;
configlval.pc_info.value = value;
// configlval.pc_info.value2 = bad_data_double;;
configlval.pc_info.value = value;


return ( SIMPLE_PERC_THRESH );
Expand All @@ -1495,9 +1503,3 @@ return ( SIMPLE_PERC_THRESH );


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






3 changes: 2 additions & 1 deletion met/src/basic/vx_util/util_constants.h
View file
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_3[] = "V9.1.3";
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";
Expand All @@ -40,7 +41,7 @@ static const char met_version_1_1[] = "V1.1";

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

static const char * const met_version = met_version_9_1_2;
static const char * const met_version = met_version_9_1_3;
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
Loading

0 comments on commit eeecc49

Please sign in to comment.