From 018046a9370048ddf1fc8064cd72b6323cd0b31c Mon Sep 17 00:00:00 2001 From: johnhg Date: Thu, 2 Dec 2021 08:37:05 -0700 Subject: [PATCH] Update main_v10.0-ref after #1986 (MET v10.0.1) (#1987) Co-authored-by: Julie Prestopnik Co-authored-by: Howard Soh Co-authored-by: bikegeek Co-authored-by: jprestop Co-authored-by: bikegeek <3753118+bikegeek@users.noreply.github.com> Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: hsoh-u --- met/docs/Users_Guide/point-stat.rst | 8 ++++---- met/docs/Users_Guide/release-notes.rst | 14 +++++++++++++ met/docs/conf.py | 4 ++-- met/src/basic/vx_util/util_constants.h | 3 ++- met/src/tools/other/madis2nc/madis2nc.cc | 25 ++++++++++++------------ 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/met/docs/Users_Guide/point-stat.rst b/met/docs/Users_Guide/point-stat.rst index bfbbc53fba..fd844614f2 100644 --- a/met/docs/Users_Guide/point-stat.rst +++ b/met/docs/Users_Guide/point-stat.rst @@ -693,7 +693,7 @@ The first set of header columns are common to all of the output files generated .. _table_PS_format_info_CTS_cont: -.. list-table:: Format information for CTS (Contingency Table Statistics) output line type, continued from above +.. list-table:: Format information for CTS (Contingency Table Statistics) output line type, continued from above :widths: auto :header-rows: 2 @@ -740,7 +740,7 @@ The first set of header columns are common to all of the output files generated .. _table_PS_format_info_CNT: -.. list-table:: Format information for CNT(Continuous Statistics) output line type. +.. list-table:: Format information for CNT (Continuous Statistics) output line type. :widths: auto :header-rows: 2 @@ -799,7 +799,7 @@ The first set of header columns are common to all of the output files generated .. _table_PS_format_info_CNT_cont: -.. list-table:: Format information for CNT(Continuous Statistics) output line type continued from above table +.. list-table:: Format information for CNT (Continuous Statistics) output line type continued from above table :widths: auto :header-rows: 2 @@ -1281,7 +1281,7 @@ The first set of header columns are common to all of the output files generated .. _table_PS_format_info_VCNT: -.. list-table:: Format information for VAL1L2 (Vector Anomaly Partial Sums) output line type. Note that each statistic (except TOTAL) is followed by two columns giving bootstrap confidence intervals. These confidence intervals are not currently calculated for this release of MET, but will be in future releases. +.. list-table:: Format information for VCNT (Vector Continuous Statistics) output line type. Note that each statistic (except TOTAL) is followed by two columns giving bootstrap confidence intervals. These confidence intervals are not currently calculated for this release of MET, but will be in future releases. :widths: auto :header-rows: 2 diff --git a/met/docs/Users_Guide/release-notes.rst b/met/docs/Users_Guide/release-notes.rst index 03b1964a8e..649dbff9b5 100644 --- a/met/docs/Users_Guide/release-notes.rst +++ b/met/docs/Users_Guide/release-notes.rst @@ -8,6 +8,20 @@ describes the bugfix, enhancement, or new feature: MET Version |version| release notes (|release_date|) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Bugfixes: + + * **Fix MTD to compute the CDIST_TRAVELLED value correctly** (`#1976 `_) + * **Fix MADIS2NC to handle the 2016 changes to its format** (`#1936 `_). + * Fix TC-Stat event equalization logic to include any model name requested using -amodel (`#1932 `_). + * Fix Ensemble-Stat failure when verifying against gridded ECMWF GRIB1 files (`#1879 `_). + * Fix python embedding when using a named grid with MET_PYTHON_EXE set (`#1798 `_). + * Fix the plot_tcmpr.R script to support specifying a directory with -lookin (`#1872 `_). + * Fix the plot_tcmpr.R script to plot extra-tropical cyclone tracks not verified against BEST tracks (`#1801 `_). + * Fix the Plot-Point-Obs documentation to remove the duplicate configuration section (`#1789 `_). + +MET Version 10.0.0 release notes (2021-05-10) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Repository and build: * **Migrate GitHub respository from the NCAR to DTCenter organization** (`#1462 `_). diff --git a/met/docs/conf.py b/met/docs/conf.py index c7ea63eb71..af011aa11c 100644 --- 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.0.0' +version = '10.0.1' verinfo = version release = f'{version}' release_year = '2021' -release_date = f'{release_year}-05-10' +release_date = f'{release_year}-12-01' copyright = f'{release_year}, {author}' # -- General configuration --------------------------------------------------- diff --git a/met/src/basic/vx_util/util_constants.h b/met/src/basic/vx_util/util_constants.h index a83e4717a6..cd7d7d18a2 100644 --- a/met/src/basic/vx_util/util_constants.h +++ b/met/src/basic/vx_util/util_constants.h @@ -18,6 +18,7 @@ //////////////////////////////////////////////////////////////////////// // Released versions of MET +static const char met_version_10_0_1[] = "V10.0.1"; static const char met_version_10_0_0[] = "V10.0.0"; static const char met_version_9_1[] = "V9.1"; static const char met_version_9_0[] = "V9.0"; @@ -39,7 +40,7 @@ static const char met_version_1_1[] = "V1.1"; //////////////////////////////////////////////////////////////////////// -static const char * const met_version = met_version_10_0_0; +static const char * const met_version = met_version_10_0_1; static const char default_met_data_dir[] = "MET_BASE"; static const char txt_file_ext[] = ".txt"; static const char stat_file_ext[] = ".stat"; diff --git a/met/src/tools/other/madis2nc/madis2nc.cc b/met/src/tools/other/madis2nc/madis2nc.cc index ded94c4f33..45e24a082e 100644 --- a/met/src/tools/other/madis2nc/madis2nc.cc +++ b/met/src/tools/other/madis2nc/madis2nc.cc @@ -84,7 +84,7 @@ static void clean_up(); static void setup_netcdf_out(int nhdr); static bool get_filtered_nc_data(NcVar var, float *data, const long dim, - const long cur, const char *var_name); + const long cur, const char *var_name, bool required=true); static bool get_filtered_nc_data_2d(NcVar var, int *data, const long *dim, const long *cur, const char *var_name, bool count_bad=false); static bool get_filtered_nc_data_2d(NcVar var, float *data, const long *dim, @@ -412,9 +412,9 @@ void setup_netcdf_out(int nhdr) { static bool get_filtered_nc_data(NcVar var, float *data, const long dim, const long cur, - const char *var_name) { + const char *var_name, bool required) { - bool status; + bool status = false; float in_fill_value; const char *method_name = "get_filtered_nc_data(float) "; @@ -431,11 +431,14 @@ static bool get_filtered_nc_data(NcVar var, float *data, } } } - else { - status = false; + else if (required) { mlog << Error << "\n" << method_name << "Can not read a NetCDF data because the variable [" << var_name << "] is missing.\n\n"; } + if(!status) { + for (int idx=0; idx