Bugfix 2370 mainv10.1 - 6 line headers and yyyy-MMM

.github/ISSUE_TEMPLATE/bug_report.md

@@ -54,7 +54,7 @@ Describe the steps to reproduce the behavior:
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
-- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdatadb](https://github.com/dtcenter/METdatadb/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
+- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdataio](https://github.com/dtcenter/METdataio/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
 
 ## Bugfix Checklist ##
 See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors_Guide/github_workflow.html) for details.

.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -43,7 +43,7 @@ Consider breaking the enhancement down into sub-issues.
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
-- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdatadb](https://github.com/dtcenter/METdatadb/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
+- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdataio](https://github.com/dtcenter/METdataio/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
 
 ## Enhancement Checklist ##
 See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors_Guide/github_workflow.html) for details.

.github/ISSUE_TEMPLATE/new_feature_request.md

@@ -47,7 +47,7 @@ Consider breaking the new feature down into sub-issues.
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
-- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdatadb](https://github.com/dtcenter/METdatadb/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
+- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdataio](https://github.com/dtcenter/METdataio/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
 
 ## New Feature Checklist ##
 See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors_Guide/github_workflow.html) for details.

.github/ISSUE_TEMPLATE/task.md

@@ -43,7 +43,7 @@ Consider breaking the task down into sub-issues.
 
 ## Define Related Issue(s) ##
 Consider the impact to the other METplus components.
-- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdatadb](https://github.com/dtcenter/METdatadb/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
+- [ ] [METplus](https://github.com/dtcenter/METplus/issues/new/choose), [MET](https://github.com/dtcenter/MET/issues/new/choose), [METdataio](https://github.com/dtcenter/METdataio/issues/new/choose), [METviewer](https://github.com/dtcenter/METviewer/issues/new/choose), [METexpress](https://github.com/dtcenter/METexpress/issues/new/choose), [METcalcpy](https://github.com/dtcenter/METcalcpy/issues/new/choose), [METplotpy](https://github.com/dtcenter/METplotpy/issues/new/choose)
 
 ## Task Checklist ##
 See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors_Guide/github_workflow.html) for details.

.github/jobs/set_job_controls.sh

@@ -17,6 +17,13 @@ if [ "${GITHUB_EVENT_NAME}" == "pull_request" ]; then
 
     run_diff=true
 
+    # if pull request into main_vX.Y branch,
+    # set truth data version to branch name and set input data version to X.Y
+    if [ "${GITHUB_BASE_REF:0:6}" == "main_v" ]; then
+      truth_data_version=${GITHUB_BASE_REF}
+      input_data_version=${GITHUB_BASE_REF:6}
+    fi
+
   fi
 
 elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
@@ -30,6 +37,11 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
     run_diff=true
     truth_data_version=${branch_name:0: -4}
 
+       # if main_vX.Y-ref branch, use X.Y input data
+       if [ "${branch_name:0:6}" == "main_v" ]; then
+         input_data_version=${branch_name:6: -4}
+       fi
+
   else
 
     # if develop or main_vX.Y branch, run diff tests using branch's truth data
@@ -39,6 +51,11 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
        run_diff=true
        truth_data_version=${branch_name}
 
+       # if main_vX.Y branch, use X.Y input data
+       if [ "${branch_name:0:6}" == "main_v" ]; then
+         input_data_version=${branch_name:6}
+       fi
+
     fi
 
     # check commit messages for skip or force keywords                                                                         
@@ -66,7 +83,13 @@ elif [ "${GITHUB_EVENT_NAME}" == "push" ]; then
     fi
 
   fi
-
+
+elif [ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]; then
+
+    if [ "${force_tests}" == "true" ]; then
+        run_diff=true
+    fi
+
 fi
 
 # if updating truth or running diff, run unit tests

.github/pull_request_template.md

@@ -30,6 +30,6 @@ See the [METplus Workflow](https://metplus.readthedocs.io/en/latest/Contributors
 Select: **Reviewer(s)**
 Select: **Organization** level software support **Project** or **Repository** level development cycle **Project**
 Select: **Milestone** as the version that will include these changes
-- [ ] After submitting the PR, select **Linked issues** with the original issue number.
+- [ ] After submitting the PR, select **Development** with the original issue number.
 - [ ] After the PR is approved, merge your changes. If permissions do not allow this, request that the reviewer do the merge.
 - [ ] Close the linked issue and delete your feature or bugfix branch from GitHub.

.github/workflows/build_docker_and_trigger_metplus.yml

@@ -7,6 +7,8 @@ on:
     paths-ignore:
       - 'met/docs/**'
 
+  workflow_dispatch:
+
 env:
   DOCKERHUB_REPO: dtcenter/met-dev
 

.github/workflows/testing.yml

@@ -23,6 +23,13 @@ on:
     paths-ignore:
       - 'met/docs/**'
 
+  workflow_dispatch:
+    inputs:
+      force_tests:
+        description: 'Run the unit tests'
+        default: true
+        type: boolean
+
 env:
   DOCKERHUB_REPO: dtcenter/met-dev
 
@@ -39,6 +46,7 @@ jobs:
         run: .github/jobs/set_job_controls.sh
         env:
           commit_msg: ${{ github.event.head_commit.message }}
+          force_tests: ${{ github.event.inputs.force_tests }}
 
     outputs:
       run_compile: ${{ steps.job_status.outputs.run_compile }}

README.md

@@ -2,6 +2,8 @@ Model Evaluation Tools (MET) Repository
 =======================================
 
 <!-- Start of Badges -->
+[![Tests](https://github.com/DTCenter/MET/actions/workflows/testing.yml/badge.svg?event=push)](https://github.com/DTCenter/MET/actions/workflows/testing.yml)
+[![Docs](https://img.shields.io/badge/Documentation-latest-brightgreen.svg)](https://met.readthedocs.io)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5565322.svg)](https://doi.org/10.5281/zenodo.5565322)
 
 This repository contains the source code for the Model Evaluation Tools package (met), unit test code (test), and scripts used to build and test the code (scripts).

met/README

@@ -188,7 +188,7 @@ sub-directory, or the MET Online Tutorial:
 
 - If all tools are enabled and the build is successful, the "<prefix>/bin"
   directory (where <prefix> is the prefix you specified on your configure
-  command line) will contain 36 executables:
+  command line) will contain the following executables:
    - ascii2nc
    - ensemble_stat
    - gen_ens_prod
@@ -200,6 +200,7 @@ sub-directory, or the MET Online Tutorial:
    - grid_diag
    - gsid2mpr
    - gsidens2orank
+   - ioda2nc
    - lidar2nc
    - madis2nc
    - mode

met/data/config/ConfigConstants

@@ -35,6 +35,13 @@ F_to_K(t) = C_to_K(F_to_C(t));
 MM_to_IN(x) = x / 25.4;
 IN_to_MM(x) = x * 25.4;
 
+M_to_FT(x)   = x * 3.28084;
+FT_to_M(x)   = x / 3.28084;
+M_to_KFT(x)  = M_to_FT(x) / 1000.0;
+KFT_to_M(x)  = FT_to_M(x * 1000.0);
+KM_to_KFT(x) = M_to_KFT(1000.0 * x);
+KFT_to_KM(x) = KFT_to_M(x) / 1000.0;
+
 PA_to_HPA(p) = p / 100.0;
 HPA_to_PA(p) = p * 100.0;
 PA_to_MB(p)  = PA_to_HPA(p);

met/docs/Users_Guide/config_options.rst

@@ -58,6 +58,13 @@ The configuration file language supports the following data types:
     and 10 and "==1||==2" defines numbers exactly equal to 1 or 2.
 
 * Percentile Thresholds:
+
+  * A threshold type (<, <=, ==, !=, >=, or >), followed by a percentile
+    type description (SFP, SOP, SCP, USP, CDP, or FBIAS), followed by a
+    numeric value, typically between 0 and 100.
+
+  * Note that the two letter threshold type abbreviations (lt, le, eq, ne,
+    ge, gt) are not supported for percentile thresholds.
 
   * Thresholds may be defined as percentiles of the data being processed in
     several places:

met/docs/Users_Guide/ensemble-stat.rst

@@ -332,7 +332,7 @@ The **prob_pct_thresh** entry is an array of thresholds which define the Nx2 pro
 
 .. code-block:: none
 
-  prob_cat_thresh = [ ==0.25 ];
+  prob_pct_thresh = [ ==0.25 ];
 
 __________________
 

met/docs/Users_Guide/point-stat.rst

@@ -851,13 +851,13 @@ The first set of header columns are common to all of the output files generated
   * - 113-115
     - RMSFA, :raw-html:`<br />` RMSFA_BCL, :raw-html:`<br />` RMSFA_BCU
     - Root mean squared forecast anomaly (f-c) including bootstrap upper and lower confidence limits
-  * - 117-119
+  * - 116-118
     - RMSOA, :raw-html:`<br />` RMSOA_BCL, :raw-html:`<br />` RMSOA_BCU
     - Root mean squared observation anomaly (o-c) including bootstrap upper and lower confidence limits
-  * - 120-122
+  * - 119-121
     - ANOM_CORR_UNCNTR, :raw-html:`<br />` ANOM_CORR_UNCNTR_BCL, :raw-html:`<br />` ANOM_CORR_UNCNTR_BCU
     - The uncentered Anomaly Correlation excluding mean error including bootstrap upper and lower confidence limits
-  * - 123-125
+  * - 122-124
     - SI, :raw-html:`<br />` SI_BCL, :raw-html:`<br />` SI_BCU
     - Scatter Index including bootstrap upper and lower confidence limits
 

met/docs/Users_Guide/release-notes.rst

@@ -5,6 +5,23 @@ When applicable, release notes are followed by the GitHub issue number which des
 enhancement, or new feature (`MET GitHub issues <https://github.com/dtcenter/MET/issues>`_).
 Important issues are listed **in bold** for emphasis.
 
+MET Version 10.1.2 release notes (20220516)
+-------------------------------------------
+
+* Bugfixes:
+
+  * Update static arrays with hard-coded size (`METplus-Internal #14 <https://github.com/dtcenter/METplus-Internal/issues/14>`_).
+  * Fix TC-Gen to only count misses from requested initialization hours and lead times (`#2148 <https://github.com/dtcenter/MET/issues/2148>`_).
+
+MET Version 10.1.1 release notes (20220419)
+-------------------------------------------
+
+* Bugfixes:
+
+   * Fix support for reading rotated lat/lon grids from CF-compliant NetCDF files (`#2115 <https://github.com/dtcenter/MET/issues/2115>`_).
+   * Fix support for reading rotated lat/lon grids from GRIB1 files (grid type 10) (`#2118 <https://github.com/dtcenter/MET/issues/2118>`_).
+   * Fix support for int64 NetCDF variable types (`#2123 <https://github.com/dtcenter/MET/issues/2123>`_).
+
 MET Version 10.1.0 release notes (20220314)
 -------------------------------------------
 

met/docs/conf.py

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

met/src/basic/vx_cal/unix_to_mdyhms.cc

@@ -16,6 +16,7 @@ using namespace std;
 
 #include <iostream>
 #include <unistd.h>
+#include <string.h>
 #include <stdlib.h>
 #include <cmath>
 
@@ -94,6 +95,35 @@ const char * short_month_name[] = {
 };
 
 
+////////////////////////////////////////////////////////////////////////
+// Converts a month string to month (1 to 12).
+
+int month_name_to_m (const char *month_str)
+
+{
+
+int month = -1;
+int str_len = strlen(month_str);
+char t_month_str[str_len + 1];
+
+for (int idx=0; idx<str_len; idx++) {
+   t_month_str[idx] = (idx==0) ? toupper(month_str[idx]) : tolower(month_str[idx]);
+}
+t_month_str[str_len] = 0;
+
+for (int idx=1; idx<=12; idx++) {
+   if (0 == strcmp(short_month_name[idx], t_month_str)
+       || 0 == strcmp(month_name[idx], t_month_str)) {
+      month = idx;
+      break;
+   }
+}
+
+return month;
+
+}
+
+
 ////////////////////////////////////////////////////////////////////////
 
 

met/src/basic/vx_cal/vx_cal.h

@@ -54,6 +54,7 @@ extern  unixtime  doyhms_to_unix  (int doy, int year, int hour, int minute, int
 extern  unixtime  mdyhms_to_unix  (int month, int day, int year, int hour, int minute, int second);
 
 extern  void      unix_to_mdyhms  (unixtime u, int & month, int & day, int & year, int & hour, int & minute, int & second);
+extern  int       month_name_to_m (const char *month_str);
 
 
 extern  int       date_to_mjd     (int m, int d, int y);

met/src/basic/vx_log/concat_string.cc

@@ -231,7 +231,10 @@ void ConcatString::assign(const ConcatString & c)
    if (c.text()) s->assign(c.text());
    else          s->clear();
 
-   memcpy(FloatFormat, c.FloatFormat, sizeof(FloatFormat));
+   int buf_size = sizeof(c.FloatFormat);
+   if (buf_size > concat_string_buf_size) buf_size = concat_string_buf_size;
+
+   memcpy(FloatFormat, c.FloatFormat, buf_size);
    Precision = c.Precision;
 }
 
@@ -337,9 +340,12 @@ if ( (k < 0) || (k > concat_string_max_precision) )  {
 if (Precision != k) {
    Precision = k;
 
-   memset(FloatFormat, 0, sizeof(FloatFormat));
+   int buf_size = sizeof(FloatFormat);
+   if (buf_size > concat_string_buf_size) buf_size = concat_string_buf_size;
+
+   memset(FloatFormat, 0, buf_size);
 
-   snprintf(FloatFormat, sizeof(FloatFormat), "%%.%df", Precision);
+   snprintf(FloatFormat, buf_size, "%%.%df", Precision);
 }
 
 return;

met/src/basic/vx_log/concat_string.h

@@ -47,6 +47,7 @@ static const int max_str_len          = 512;
 static const int concat_string_default_precision =  5;
 
 static const int concat_string_max_precision     = 12;
+static const int concat_string_buf_size          = concat_string_max_precision + 4;
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -73,7 +74,7 @@ class ConcatString {
 
       int Precision;
 
-      char FloatFormat[16];
+      char FloatFormat[concat_string_buf_size];
 
       std::string *s;
 

met/src/basic/vx_util/ascii_table.cc

@@ -271,8 +271,12 @@ BadDataValue = a.BadDataValue;
 
 set_bad_data_str(a.BadDataStr);
 
-memcpy(f_FloatFormat, a.f_FloatFormat, sizeof(f_FloatFormat));
-memcpy(g_FloatFormat, a.g_FloatFormat, sizeof(g_FloatFormat));
+int f_buf_size = sizeof(a.f_FloatFormat);
+int g_buf_size = sizeof(a.g_FloatFormat);
+if (f_buf_size > ascii_table_buf_size) f_buf_size = ascii_table_buf_size;
+if (g_buf_size > ascii_table_buf_size) g_buf_size = ascii_table_buf_size;
+memcpy(f_FloatFormat, a.f_FloatFormat, f_buf_size);
+memcpy(g_FloatFormat, a.g_FloatFormat, g_buf_size);
 
 DoCommaString = a.DoCommaString;
 
@@ -697,11 +701,15 @@ if ( (k < 0) || (k > ascii_table_max_precision) )  {
 
 Precision = k;
 
-memset(f_FloatFormat, 0, sizeof(f_FloatFormat));
-memset(g_FloatFormat, 0, sizeof(g_FloatFormat));
+int f_buf_size = sizeof(f_FloatFormat);
+int g_buf_size = sizeof(g_FloatFormat);
+if (f_buf_size > ascii_table_buf_size) f_buf_size = ascii_table_buf_size;
+if (g_buf_size > ascii_table_buf_size) g_buf_size = ascii_table_buf_size;
+memset(f_FloatFormat, 0, f_buf_size);
+memset(g_FloatFormat, 0, g_buf_size);
 
-snprintf(f_FloatFormat, sizeof(f_FloatFormat), "%%.%df", Precision);
-snprintf(g_FloatFormat, sizeof(g_FloatFormat), "%%.%dg", Precision);
+snprintf(f_FloatFormat, f_buf_size, "%%.%df", Precision);
+snprintf(g_FloatFormat, g_buf_size, "%%.%dg", Precision);
 
 return;
 

met/src/basic/vx_util/ascii_table.h

@@ -112,6 +112,7 @@ static const bool default_fill_blank = false;
 static const int ascii_table_default_precision         = 2;
 
 static const int ascii_table_max_precision             = 12;
+static const int ascii_table_buf_size                  = ascii_table_max_precision + 4;
 
 static const double ascii_table_default_bad_data_value = -9999.0;
 
@@ -163,8 +164,8 @@ class AsciiTable {
 
       std::string BadDataStr;
 
-      char   f_FloatFormat[16];
-      char   g_FloatFormat[16];
+      char   f_FloatFormat[ascii_table_buf_size];
+      char   g_FloatFormat[ascii_table_buf_size];
 
 
       bool   DoCommaString;   //  do comma string?