Update develop-ref after #2680 and #2683 (#2684)

Co-authored-by: jprestop <jpresto@ucar.edu> Co-authored-by: Seth Linden <linden@seneca.rap.ucar.edu> Co-authored-by: John Halley Gotway <johnhg@ucar.edu> Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu> Co-authored-by: John and Cindy <halleygotway@Halleys-Mac-mini.local> Co-authored-by: rgbullock <bullock@ucar.edu> Co-authored-by: Randy Bullock <bullock@seneca.rap.ucar.edu> Co-authored-by: Dave Albo <dave@seneca.rap.ucar.edu> Co-authored-by: Howard Soh <hsoh@seneca.rap.ucar.edu> Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com> Co-authored-by: hsoh-u <hsoh@ucar.edu> Co-authored-by: MET Tools Test Account <met_test@seneca.rap.ucar.edu> Co-authored-by: Seth Linden <linden@ucar.edu> Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com> Co-authored-by: davidalbo <dave@ucar.edu> Co-authored-by: Lisa Goodrich <lisag@ucar.edu> Co-authored-by: metplus-bot <97135045+metplus-bot@users.noreply.github.com> Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Jonathan Vigh <jvigh@ucar.edu> Co-authored-by: Tracy Hertneky <39317287+hertneky@users.noreply.github.com> Co-authored-by: David Albo <dave@ucar.edu> Co-authored-by: Dan Adriaansen <dadriaan@ucar.edu> fix 2518 dtypes appf docs (#2519) fix 2531 compilation errors (#2533) fix #2531 compilation_errors_configure (#2535) fix #2514 develop clang (#2563) fix #2575 develop python_convert (#2576) Fix Python environment issue (#2407) fix definitions of G172 and G220 based on comments in NOAA-EMC/NCEPLIBS-w3emc#157. (#2406) fix #2380 develop override (#2382) fix #2408 develop empty config (#2410) fix #2390 develop compile zlib (#2404) fix #2412 develop climo (#2422) fix #2437 develop convert (#2439) fix for develop, for #2437, forgot one reference to the search_parent for a dictionary lookup. fix #2452 develop airnow (#2454) fix #2449 develop pdf (#2464) fix #2402 develop sonarqube (#2468) fix #2426 develop buoy (#2475) fix 2596 main v11.1 rpath compilation (#2614) fix #2514 main_v11.1 clang (#2628) fix #2644 develop percentile (#2647)
dtcenter · Sep 15, 2023 · 80afcac · 80afcac
1 parent ce51f2e
commit 80afcac
Show file tree

Hide file tree

Showing 92 changed files with 462 additions and 130 deletions.
diff --git a/data/config/EnsembleStatConfig_default b/data/config/EnsembleStatConfig_default
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/data/config/GenEnsProdConfig_default b/data/config/GenEnsProdConfig_default
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/data/config/GridStatConfig_default b/data/config/GridStatConfig_default
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/data/config/MODEConfig_default b/data/config/MODEConfig_default
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/data/config/MODEMultivarConfig_default b/data/config/MODEMultivarConfig_default
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/data/config/MTDConfig_default b/data/config/MTDConfig_default
@@ -10,7 +10,7 @@
    // Output model name to be written
    //
 
-model = "WRF";
+model = "FCST";
 
    //
    // Output description to be written

diff --git a/data/config/PointStatConfig_default b/data/config/PointStatConfig_default
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/data/config/SeriesAnalysisConfig_default b/data/config/SeriesAnalysisConfig_default
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/data/config/TCDiagConfig_default b/data/config/TCDiagConfig_default
@@ -45,9 +45,14 @@ valid_exc = [];
 
 //
 // Subset by the valid hour and lead time.
+// By default, compute diagnostics every 6 hours out to 126 hours.
 //
 valid_hour = [];
-lead       = [];
+lead       = [   "0",   "6",  "12",  "18",  "24",
+                "30",  "36",  "42",  "48",  "54",
+                "60",  "66",  "72",  "78",  "84",
+                "90",  "96", "102", "108", "114",
+               "120", "126" ];
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -134,6 +139,11 @@ vortex_removal = FALSE;
 
 ////////////////////////////////////////////////////////////////////////////////
 
+//
+// Flag to control input files
+//
+one_time_per_file_flag = TRUE;
+
 //
 // Flags to control output files
 //

diff --git a/data/config/WaveletStatConfig_default b/data/config/WaveletStatConfig_default
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/docs/Users_Guide/config_options.rst b/docs/Users_Guide/config_options.rst
@@ -602,7 +602,7 @@ e.g. model = "GFS";
 
 .. code-block:: none
 		
-  model = "WRF";
+  model = "FCST";
 
 desc
 ^^^^

diff --git a/docs/Users_Guide/config_options_tc.rst b/docs/Users_Guide/config_options_tc.rst
@@ -108,7 +108,7 @@ For example:
 valid_beg end inc exc
 ---------------------
 
-Specify a model valid time window YYYYMMDD[_HH[MMSS]] format or provide a
+Specify a model valid time window in YYYYMMDD[_HH[MMSS]] format or provide a
 list of specific valid times to include (inc) or exclude (exc). If a time
 window is specified, only tracks for which all points are contained within
 the window will be used. If valid times to include or exclude are specified,
@@ -1077,7 +1077,7 @@ Statistics will be generated separately for each ATCF ID.
 init_beg, init_end
 ^^^^^^^^^^^^^^^^^^
 
-Forecast and operational initialization time window
+Forecast and operational initialization time window, as strings in YYYYMMDD[_HH[MMSS]] format
 
 .. code-block:: none
 
@@ -1087,7 +1087,7 @@ Forecast and operational initialization time window
 valid_beg, valid_end
 ^^^^^^^^^^^^^^^^^^^^
 
-Forecast, BEST, and operational valid time window
+Forecast, BEST, and operational valid time window, as strings in YYYYMMDD[_HH[MMSS]] format
 
 .. code-block:: none
 		
@@ -1097,7 +1097,7 @@ Forecast, BEST, and operational valid time window
 lead
 ^^^^
 
-Forecast and operational lead times in hours
+Forecast and operational lead times, as strings in HH[MMSS] format
 
 .. code-block:: none
 

diff --git a/docs/Users_Guide/ensemble-stat.rst b/docs/Users_Guide/ensemble-stat.rst
@@ -156,7 +156,7 @@ ____________________
 
 .. code-block:: none
 
-  model          = "WRF";
+  model          = "FCST";
   desc           = "NA";
   obtype         = "ANALYS";
   regrid         = { ... }

diff --git a/docs/Users_Guide/gen-ens-prod.rst b/docs/Users_Guide/gen-ens-prod.rst
@@ -96,7 +96,7 @@ ____________________
 
 .. code-block:: none
 
-  model          = "WRF";
+  model          = "FCST";
   desc           = "NA";
   regrid         = { ... }
   censor_thresh  = [];

diff --git a/docs/Users_Guide/grid-stat.rst b/docs/Users_Guide/grid-stat.rst
@@ -236,7 +236,7 @@ __________________________
 
 .. code-block:: none
 
-  model          = "WRF";
+  model          = "FCST";
   desc           = "NA";
   obtype         = "ANALYS"; 
   fcst           = { ... }

diff --git a/docs/Users_Guide/mode-td.rst b/docs/Users_Guide/mode-td.rst
@@ -246,7 +246,7 @@ ______________________
 
 .. code-block:: none
 
-  model          = "WRF";
+  model          = "FCST";
   desc           = "NA";
   obtype         = "ANALYS";
   regrid         = { ... }

diff --git a/docs/Users_Guide/mode.rst b/docs/Users_Guide/mode.rst
@@ -203,7 +203,7 @@ _____________________
 
 .. code-block:: none
 
-  model          = "WRF";
+  model          = "FCST";
   desc           = "NA";
   obtype         = "ANALYS";
   regrid         = { ... }

diff --git a/docs/Users_Guide/point-stat.rst b/docs/Users_Guide/point-stat.rst
@@ -331,7 +331,7 @@ ________________________
 
 .. code-block:: none
 
-  model          = "WRF";
+  model          = "FCST";
   desc           = "NA";
   regrid         = { ... }
   climo_mean     = { ... }

diff --git a/docs/Users_Guide/series-analysis.rst b/docs/Users_Guide/series-analysis.rst
@@ -99,7 +99,7 @@ ____________________
 
 .. code-block:: none
 
-  model          = "WRF";
+  model          = "FCST";
   desc           = "NA";
   obtype         = "ANALYS";
   regrid         = { ... }

diff --git a/docs/Users_Guide/tc-diag.rst b/docs/Users_Guide/tc-diag.rst
@@ -94,12 +94,21 @@ Configuring input tracks and time
   valid_inc = [];
   valid_exc = [];
   valid_hour = [];
-  lead = [];
 
 The TC-Diag tool should be configured to filter the input track data (**-deck**) down to the subset of tracks that correspond to the gridded data files provided (**-data**). The filtered tracks should contain data for only *one initialization time* but may contain tracks for multiple models.
 
 The configuration options listed above are used to filter the input track data down to those that should be processed in the current run. These options are common to multiple MET tools and are described in :numref:`config_options_tc`.
 
+.. code-block:: none
+
+  lead = [   "0",    "6",  "12",  "18",  "24",
+            "30",   "36",  "42",  "48",  "54",
+            "60",   "66",  "72",  "78",  "84",
+            "90",   "96", "102", "108", "114",
+            "120", "126" ];
+
+The **lead** entry is an array of strings specifying lead times in HH[MMSS] format. By default, diagnostics are computed every 6 hours out to 126 hours. Lead times for which no track point or gridded model data exist produce a warning message and diagnostics set to a missing data value.
+
 Configuring domain information
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -204,8 +213,16 @@ The **vortex_removal** flag entry is a boolean specifying whether or not vortex
 
 .. note:: As of MET version 11.1.0, vortex removal logic is not yet supported.
 
-Configuring data output options
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Configuring data input and output options
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: none
+
+  one_time_per_file_flag = TRUE;
+
+The **one_time_per_file_flag** entry controls the logic for reading data from input files. This option describes how data is stored in the gridded input files specified with the **-data** command line option. Set this to true if each input file contains all of the data for a single initialization time and for a single valid time. If the input files contain data for multiple initialization or valid times, or if data for one valid time is spread across multiple files, set this to false.
+
+If true, all input fields are read efficiently from each file in a single call. If false, each field is processed separately in a less efficient manner.
 
 .. code-block:: none
 

diff --git a/docs/Users_Guide/wavelet-stat.rst b/docs/Users_Guide/wavelet-stat.rst
@@ -211,7 +211,7 @@ _______________________
 
 .. code-block:: none
 
-  model             = "WRF";
+  model             = "FCST";
   desc              = "NA";
   obtype            = "ANALYS";
   fcst              = { ... }

diff --git a/internal/test_unit/R_test/test_util.R b/internal/test_unit/R_test/test_util.R
@@ -856,7 +856,7 @@ compareDiff = function(file1, file2, verb=0){
 	else if( 1 <= verb ){ cat("passed diff\n"); }
 }
 
-listHeaderCols = c("VERSION", "DESC", "MODEL",
+listHeaderCols = c("VERSION", "MODEL", "DESC",
                    "FCST_LEAD", "FCST_VALID_BEG", "FCST_VALID_END",
                    "OBS_LEAD", "OBS_VALID_BEG", "OBS_VALID_END",
                    "FCST_VAR", "FCST_UNITS", "FCST_LEV",

diff --git a/internal/test_unit/config/EnsembleStatConfig b/internal/test_unit/config/EnsembleStatConfig
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/EnsembleStatConfig_MASK_SID b/internal/test_unit/config/EnsembleStatConfig_MASK_SID
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/EnsembleStatConfig_climo b/internal/test_unit/config/EnsembleStatConfig_climo
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/EnsembleStatConfig_grid_weight b/internal/test_unit/config/EnsembleStatConfig_grid_weight
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/EnsembleStatConfig_one_cdf_bin b/internal/test_unit/config/EnsembleStatConfig_one_cdf_bin
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/EnsembleStatConfig_qty_inc_exc b/internal/test_unit/config/EnsembleStatConfig_qty_inc_exc
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/GenEnsProdConfig b/internal/test_unit/config/GenEnsProdConfig
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/GenEnsProdConfig_normalize b/internal/test_unit/config/GenEnsProdConfig_normalize
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/GridStatConfig_APCP_regrid b/internal/test_unit/config/GridStatConfig_APCP_regrid
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/GridStatConfig_SEEPS b/internal/test_unit/config/GridStatConfig_SEEPS
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/GridStatConfig_rtma b/internal/test_unit/config/GridStatConfig_rtma
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/GridStatConfig_rtma_perc_thresh b/internal/test_unit/config/GridStatConfig_rtma_perc_thresh
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written

diff --git a/internal/test_unit/config/GridStatConfig_st4 b/internal/test_unit/config/GridStatConfig_st4
@@ -9,7 +9,7 @@
 //
 // Output model name to be written
 //
-model = "WRF";
+model = "FCST";
 
 //
 // Output description to be written
-Original file line number
+Diff line change
@@ Expand Up / @@ -602,7 +602,7 @@ e.g. model = "GFS"; @@
     .. code-block:: none
-      model = "WRF";
+      model = "FCST";
     desc
     ^^^^
@@ Expand Down @@