Update Develop-ref after #1491, #1492, and MET changes

.github/jobs/docker_setup.sh

@@ -33,18 +33,25 @@ export DOCKERFILE_PATH=${GITHUB_WORKSPACE}/scripts/docker/Dockerfile
 
 MET_TAG=`${GITHUB_WORKSPACE}/scripts/docker/hooks/get_met_version`
 
+MET_DOCKER_REPO=met-dev
+if [ "${MET_TAG}" != "develop" ]; then
+    MET_DOCKER_REPO=met
+fi
+
 # if MET_FORCE_TAG variable is set and not empty, use that version instead
 if [ ! -z "$MET_FORCE_TAG" ]; then
     MET_TAG=$MET_FORCE_TAG
 fi
 
+echo Using MET_DOCKER_REPO=$MET_DOCKER_REPO
 echo Using MET_TAG=$MET_TAG
 echo Setting DOCKER_BUILDKIT=1
 export DOCKER_BUILDKIT=1
 
 time_command docker build --pull --cache-from ${DOCKERHUB_TAG} \
 -t ${DOCKERHUB_TAG} \
 --build-arg OBTAIN_SOURCE_CODE=copy \
+--build-arg MET_DOCKER_REPO=$MET_DOCKER_REPO \
 --build-arg MET_TAG=$MET_TAG \
 -f ${DOCKERFILE_PATH} ${GITHUB_WORKSPACE}
 

.github/jobs/set_job_controls.sh

@@ -42,7 +42,8 @@ else
   # if develop or main branch, run all use cases
   branch_name=`cut -d "/" -f3 <<< "${GITHUB_REF}"`
   if [ "$branch_name" == "develop" ] || \
-     [ "${branch_name:0:6}" == "main_v" ]; then
+	 [ "${branch_name:0:6}" == "main_v" ]; then
+    run_use_cases=true
     run_all_use_cases=true
   fi
 

.github/parm/use_case_groups.json

@@ -11,7 +11,7 @@
   },
   {
     "category": "met_tool_wrapper",
-    "index_list": "59",
+    "index_list": "59-60",
     "run": false
   },
   {
@@ -181,12 +181,7 @@
   },
   {
     "category": "tc_and_extra_tc",
-    "index_list": "3",
-    "run": false
-  },
-  {
-    "category": "tc_and_extra_tc",
-    "index_list": "4",
+    "index_list": "3-5",
     "run": false
   }
 ]

docs/Users_Guide/glossary.rst

@@ -5038,25 +5038,45 @@ METplus Configuration Glossary
      | *Used by:*  TCGen
 
    TC_GEN_OUTPUT_FLAG_FHO
-     Specify the value of output_flag.fho in the MET configuration file.
+     Specify the value of output_flag.fho in the MET configuration file for TCGen.
 
      | *Used by:*  TCGen
 
    TC_GEN_OUTPUT_FLAG_CTC
-     Specify the value of output_flag.ctc in the MET configuration file.
+     Specify the value of output_flag.ctc in the MET configuration file for TCGen.
 
      | *Used by:*  TCGen
 
    TC_GEN_OUTPUT_FLAG_CTS
-     Specify the value of output_flag.cts in the MET configuration file.
+     Specify the value of output_flag.cts in the MET configuration file for TCGen.
 
      | *Used by:*  TCGen
 
    TC_GEN_OUTPUT_FLAG_GENMPR
-     Specify the value of output_flag.genmpr in the MET configuration file.
+     Specify the value of output_flag.genmpr in the MET configuration file for TCGen.
 
      | *Used by:*  TCGen
 
+   TC_GEN_OUTPUT_FLAG_PCT
+     Specify the value for 'output_flag.pct' in the MET configuration file for TCGen.
+
+     | *Used by:* TCGen
+
+   TC_GEN_OUTPUT_FLAG_PSTD
+     Specify the value for 'output_flag.pstd' in the MET configuration file for TCGen.
+
+     | *Used by:* TCGen
+
+   TC_GEN_OUTPUT_FLAG_PJC
+     Specify the value for 'output_flag.pjc' in the MET configuration file for TCGen.
+
+     | *Used by:* TCGen
+
+   TC_GEN_OUTPUT_FLAG_PRC
+     Specify the value for 'output_flag.prc' in the MET configuration file for TCGen.
+
+     | *Used by:* TCGen
+
    TC_GEN_NC_PAIRS_FLAG_LATLON
      Specify the value of nc_pairs_flag.latlon in the MET configuration file.
 
@@ -5732,6 +5752,31 @@ METplus Configuration Glossary
 
      | *Used by:*  EnsembleStat
 
+   ENSEMBLE_STAT_OUTPUT_FLAG_PCT
+     Specify the value for 'output_flag.pct' in the MET configuration file for EnsembleStat.
+
+     | *Used by:* EnsembleStat
+
+   ENSEMBLE_STAT_OUTPUT_FLAG_PSTD
+     Specify the value for 'output_flag.pstd' in the MET configuration file for EnsembleStat.
+
+     | *Used by:* EnsembleStat
+
+   ENSEMBLE_STAT_OUTPUT_FLAG_PJC
+     Specify the value for 'output_flag.pjc' in the MET configuration file for EnsembleStat.
+
+     | *Used by:* EnsembleStat
+
+   ENSEMBLE_STAT_OUTPUT_FLAG_PRC
+     Specify the value for 'output_flag.prc' in the MET configuration file for EnsembleStat.
+
+     | *Used by:* EnsembleStat
+
+   ENSEMBLE_STAT_OUTPUT_FLAG_ECLV
+     Specify the value for 'output_flag.eclv' in the MET configuration file for EnsembleStat.
+
+     | *Used by:* EnsembleStat
+
    ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON
      Specify the value for 'ensemble_flag.latlon' in the MET configuration file for EnsembleStat.
 
@@ -9126,3 +9171,23 @@ METplus Configuration Glossary
      Specify the value for 'climo_cdf.direct_prob' in the MET configuration file for SeriesAnalysis.
 
      | *Used by:* SeriesAnalysis
+
+   GEN_ENS_PROD_NORMALIZE
+     Specify the value for 'normalize' in the MET configuration file for GenEnsProd.
+
+     | *Used by:* GenEnsProd
+
+   ENSEMBLE_STAT_PROB_CAT_THRESH
+     Specify the value for 'prob_cat_thresh' in the MET configuration file for EnsembleStat.
+
+     | *Used by:* EnsembleStat
+
+   ENSEMBLE_STAT_PROB_PCT_THRESH
+     Specify the value for 'prob_pct_thresh' in the MET configuration file for EnsembleStat.
+
+     | *Used by:* EnsembleStat
+
+   ENSEMBLE_STAT_ECLV_POINTS
+     Specify the value for 'eclv_points' in the MET configuration file for EnsembleStat.
+
+     | *Used by:* EnsembleStat

docs/Users_Guide/usecases.rst

@@ -4,6 +4,10 @@
 METplus Use Cases
 *****************
 
+The METplus Use Cases provide a low-level workflow which includes setting paths
+to data, dates to process, the order of processing, and configuration options.
+The METplus Wrappers pass data and configuration options to the MET tools.
+
 .. toctree::
    :titlesonly:
 

docs/Users_Guide/wrappers.rst

@@ -268,6 +268,11 @@ METplus Configuration
 | :term:`ENSEMBLE_STAT_OUTPUT_FLAG_ORANK`
 | :term:`ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR`
 | :term:`ENSEMBLE_STAT_OUTPUT_FLAG_RELP`
+| :term:`ENSEMBLE_STAT_OUTPUT_FLAG_PCT`
+| :term:`ENSEMBLE_STAT_OUTPUT_FLAG_PSTD`
+| :term:`ENSEMBLE_STAT_OUTPUT_FLAG_PJC`
+| :term:`ENSEMBLE_STAT_OUTPUT_FLAG_PRC`
+| :term:`ENSEMBLE_STAT_OUTPUT_FLAG_ECLV`
 | :term:`ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON`
 | :term:`ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN`
 | :term:`ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV`
@@ -288,6 +293,9 @@ METplus Configuration
 | :term:`ENSEMBLE_STAT_ENS_MEMBER_IDS`
 | :term:`ENSEMBLE_STAT_CONTROL_ID`
 | :term:`ENSEMBLE_STAT_GRID_WEIGHT_FLAG`
+| :term:`ENSEMBLE_STAT_PROB_CAT_THRESH`
+| :term:`ENSEMBLE_STAT_PROB_PCT_THRESH`
+| :term:`ENSEMBLE_STAT_ECLV_POINTS`
 | :term:`ENSEMBLE_STAT_VERIFICATION_MASK_TEMPLATE` (optional)
 | :term:`ENS_VAR<n>_NAME` (optional)
 | :term:`ENS_VAR<n>_LEVELS` (optional)
@@ -507,6 +515,39 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`ENSEMBLE_STAT_NMEP_SMOOTH_WIDTH`
      - nmep_smooth.type.width
 
+**${METPLUS_PROB_CAT_THRESH}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`ENSEMBLE_STAT_PROB_CAT_THRESH`
+     - prob_cat_thresh
+
+**${METPLUS_PROB_PCT_THRESH}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`ENSEMBLE_STAT_PROB_PCT_THRESH`
+     - prob_pct_thresh
+
+**${METPLUS_ECLV_POINTS}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`ENSEMBLE_STAT_ECLV_POINTS`
+     - eclv_points
+
 **${METPLUS_FCST_FILE_TYPE}**
 
 .. list-table::
@@ -795,6 +836,16 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
      - output_flag.ssvar
    * - :term:`ENSEMBLE_STAT_OUTPUT_FLAG_RELP`
      - output_flag.relp
+   * - :term:`ENSEMBLE_STAT_OUTPUT_FLAG_PCT`
+     - output_flag.pct
+   * - :term:`ENSEMBLE_STAT_OUTPUT_FLAG_PSTD`
+     - output_flag.pstd
+   * - :term:`ENSEMBLE_STAT_OUTPUT_FLAG_PJC`
+     - output_flag.pjc
+   * - :term:`ENSEMBLE_STAT_OUTPUT_FLAG_PRC`
+     - output_flag.prc
+   * - :term:`ENSEMBLE_STAT_OUTPUT_FLAG_ECLV`
+     - output_flag.eclv
 
 **${METPLUS_ENSEMBLE_FLAG_DICT}**
 
@@ -1051,6 +1102,7 @@ METplus Configuration
 | :term:`GEN_ENS_PROD_CENSOR_THRESH`
 | :term:`GEN_ENS_PROD_CENSOR_VAL`
 | :term:`GEN_ENS_PROD_CAT_THRESH`
+| :term:`GEN_ENS_PROD_NORMALIZE`
 | :term:`GEN_ENS_PROD_NC_VAR_STR`
 | :term:`GEN_ENS_PROD_ENS_THRESH`
 | :term:`GEN_ENS_PROD_ENS_VLD_THRESH`
@@ -1188,6 +1240,17 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
    * - :term:`GEN_ENS_PROD_CENSOR_VAL`
      - censor_val
 
+**${METPLUS_NORMALIZE}**
+
+.. list-table::
+   :widths: 5 5
+   :header-rows: 0
+
+   * - METplus Config(s)
+     - MET Config File
+   * - :term:`GEN_ENS_PROD_NORMALIZE`
+     - normalize
+
 **${METPLUS_CAT_THRESH}**
 
 .. list-table::
@@ -7002,6 +7065,10 @@ METplus Configuration
 | :term:`TC_GEN_OUTPUT_FLAG_FHO`
 | :term:`TC_GEN_OUTPUT_FLAG_CTC`
 | :term:`TC_GEN_OUTPUT_FLAG_CTS`
+| :term:`TC_GEN_OUTPUT_FLAG_PCT`
+| :term:`TC_GEN_OUTPUT_FLAG_PSTD`
+| :term:`TC_GEN_OUTPUT_FLAG_PJC`
+| :term:`TC_GEN_OUTPUT_FLAG_PRC`
 | :term:`TC_GEN_OUTPUT_FLAG_GENMPR`
 | :term:`TC_GEN_NC_PAIRS_FLAG_LATLON`
 | :term:`TC_GEN_NC_PAIRS_FLAG_FCST_GENESIS`
@@ -7445,6 +7512,14 @@ see :ref:`How METplus controls MET config file settings<metplus-control-met>`.
      - output_flag.ctc
    * - :term:`TC_GEN_OUTPUT_FLAG_CTS`
      - output_flag.cts
+   * - :term:`TC_GEN_OUTPUT_FLAG_PCT`
+     - output_flag.pct
+   * - :term:`TC_GEN_OUTPUT_FLAG_PSTD`
+     - output_flag.pstd
+   * - :term:`TC_GEN_OUTPUT_FLAG_PJC`
+     - output_flag.pjc
+   * - :term:`TC_GEN_OUTPUT_FLAG_PRC`
+     - output_flag.prc
    * - :term:`TC_GEN_OUTPUT_FLAG_GENMPR`
      - output_flag.genmpr