From 6899f183f3edcf23e61f26bb488e8d8103efb072 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Thu, 14 Sep 2023 12:43:41 -0600 Subject: [PATCH 1/5] Per #2682, change default model name from WRF to FCST --- data/config/EnsembleStatConfig_default | 2 +- data/config/GenEnsProdConfig_default | 2 +- data/config/GridStatConfig_default | 2 +- data/config/MODEConfig_default | 2 +- data/config/MODEMultivarConfig_default | 2 +- data/config/MTDConfig_default | 2 +- data/config/PointStatConfig_default | 2 +- data/config/SeriesAnalysisConfig_default | 2 +- data/config/WaveletStatConfig_default | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/config/EnsembleStatConfig_default b/data/config/EnsembleStatConfig_default index d7b003bb02..57f1984807 100644 --- 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 index e979270203..e2cb994bba 100644 --- 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 index a18b668419..4bec5ecf4b 100644 --- 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 index b96ceb7160..7cfe46a6b4 100644 --- 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 index 45c612e497..66ab5dfdf3 100644 --- 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 index 1774458415..b5f185ff7e 100644 --- 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 index fde6d0e17f..d4b277c6a3 100644 --- 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 index 1ab74aee7b..2b0cdfa53e 100644 --- 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/WaveletStatConfig_default b/data/config/WaveletStatConfig_default index 09c3b4d153..668f0a655d 100644 --- 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 From 69deae85c415692a6dfa96c15772391957d13943 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Thu, 14 Sep 2023 12:45:24 -0600 Subject: [PATCH 2/5] Per #2682, change default model name from WRF to FCST in the MET test scripts area --- scripts/config/EnsembleStatConfig | 2 +- scripts/config/GenEnsProdConfig | 2 +- scripts/config/GridStatConfig_APCP_12 | 2 +- scripts/config/GridStatConfig_APCP_24 | 2 +- scripts/config/GridStatConfig_POP_12 | 2 +- scripts/config/GridStatConfig_all | 2 +- scripts/config/MODEConfig_APCP_12 | 2 +- scripts/config/MODEConfig_APCP_24 | 2 +- scripts/config/MODEConfig_RH | 2 +- scripts/config/PointStatConfig | 2 +- scripts/config/WaveletStatConfig_APCP_12 | 2 +- scripts/config/WaveletStatConfig_APCP_12_NC | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/config/EnsembleStatConfig b/scripts/config/EnsembleStatConfig index 52309f857b..bc84b81d8e 100644 --- a/scripts/config/EnsembleStatConfig +++ b/scripts/config/EnsembleStatConfig @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/scripts/config/GenEnsProdConfig b/scripts/config/GenEnsProdConfig index 27fc32b618..74350a328d 100644 --- a/scripts/config/GenEnsProdConfig +++ b/scripts/config/GenEnsProdConfig @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/scripts/config/GridStatConfig_APCP_12 b/scripts/config/GridStatConfig_APCP_12 index bdbfb78ca2..2358000a81 100644 --- a/scripts/config/GridStatConfig_APCP_12 +++ b/scripts/config/GridStatConfig_APCP_12 @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/scripts/config/GridStatConfig_APCP_24 b/scripts/config/GridStatConfig_APCP_24 index fcd4a0611c..39eaa7d220 100644 --- a/scripts/config/GridStatConfig_APCP_24 +++ b/scripts/config/GridStatConfig_APCP_24 @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/scripts/config/GridStatConfig_POP_12 b/scripts/config/GridStatConfig_POP_12 index 71bb4ed9dd..6fb4775939 100644 --- a/scripts/config/GridStatConfig_POP_12 +++ b/scripts/config/GridStatConfig_POP_12 @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/scripts/config/GridStatConfig_all b/scripts/config/GridStatConfig_all index 8f0d58d274..a165ef836d 100644 --- a/scripts/config/GridStatConfig_all +++ b/scripts/config/GridStatConfig_all @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/scripts/config/MODEConfig_APCP_12 b/scripts/config/MODEConfig_APCP_12 index 733076d4fc..01976934a1 100644 --- a/scripts/config/MODEConfig_APCP_12 +++ b/scripts/config/MODEConfig_APCP_12 @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/scripts/config/MODEConfig_APCP_24 b/scripts/config/MODEConfig_APCP_24 index 3950a6b316..baeb2f27cc 100644 --- a/scripts/config/MODEConfig_APCP_24 +++ b/scripts/config/MODEConfig_APCP_24 @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/scripts/config/MODEConfig_RH b/scripts/config/MODEConfig_RH index dcdd115ae6..8448ec4068 100644 --- a/scripts/config/MODEConfig_RH +++ b/scripts/config/MODEConfig_RH @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/scripts/config/PointStatConfig b/scripts/config/PointStatConfig index ee4915fdc3..3c79f15262 100644 --- a/scripts/config/PointStatConfig +++ b/scripts/config/PointStatConfig @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/scripts/config/WaveletStatConfig_APCP_12 b/scripts/config/WaveletStatConfig_APCP_12 index 51b1d84246..fab8eb940a 100644 --- a/scripts/config/WaveletStatConfig_APCP_12 +++ b/scripts/config/WaveletStatConfig_APCP_12 @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/scripts/config/WaveletStatConfig_APCP_12_NC b/scripts/config/WaveletStatConfig_APCP_12_NC index 2e0fb2efea..2a11427926 100644 --- a/scripts/config/WaveletStatConfig_APCP_12_NC +++ b/scripts/config/WaveletStatConfig_APCP_12_NC @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written From e9e18c424da96ba03796a87d55abb218c0f0dbc8 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Thu, 14 Sep 2023 12:46:45 -0600 Subject: [PATCH 3/5] Per #2682, change default model name from WRF to FCST in the unit test area --- internal/test_unit/config/EnsembleStatConfig | 2 +- internal/test_unit/config/EnsembleStatConfig_MASK_SID | 2 +- internal/test_unit/config/EnsembleStatConfig_climo | 2 +- internal/test_unit/config/EnsembleStatConfig_grid_weight | 2 +- internal/test_unit/config/EnsembleStatConfig_one_cdf_bin | 2 +- internal/test_unit/config/EnsembleStatConfig_qty_inc_exc | 2 +- internal/test_unit/config/GenEnsProdConfig | 2 +- internal/test_unit/config/GenEnsProdConfig_normalize | 2 +- internal/test_unit/config/GridStatConfig_APCP_regrid | 2 +- internal/test_unit/config/GridStatConfig_SEEPS | 2 +- internal/test_unit/config/GridStatConfig_rtma | 2 +- internal/test_unit/config/GridStatConfig_rtma_perc_thresh | 2 +- internal/test_unit/config/GridStatConfig_st4 | 2 +- internal/test_unit/config/MODEConfig_cut_line | 2 +- internal/test_unit/config/MODEConfig_hmt | 2 +- internal/test_unit/config/MODEConfig_multivar_fake_data | 2 +- .../config/MODEConfig_multivar_fake_data_with_intensities | 2 +- internal/test_unit/config/MODEConfig_perc_thresh | 2 +- internal/test_unit/config/MODEConfig_python | 2 +- internal/test_unit/config/MODEConfig_python_mixed | 2 +- internal/test_unit/config/MODEConfig_quilt | 2 +- internal/test_unit/config/MTDConfig_simple | 2 +- internal/test_unit/config/PointStatConfig_APCP | 2 +- internal/test_unit/config/PointStatConfig_APCP_HIRA | 2 +- internal/test_unit/config/PointStatConfig_LAND_TOPO_MASK | 2 +- internal/test_unit/config/PointStatConfig_MASK_SID | 2 +- internal/test_unit/config/PointStatConfig_PHYS | 2 +- internal/test_unit/config/PointStatConfig_PHYS_pint | 2 +- internal/test_unit/config/PointStatConfig_WINDS | 2 +- internal/test_unit/config/PointStatConfig_dup | 2 +- internal/test_unit/config/PointStatConfig_obs_summary | 2 +- internal/test_unit/config/PointStatConfig_obs_summary_all | 2 +- internal/test_unit/config/PointStatConfig_prob | 2 +- internal/test_unit/config/PointStatConfig_python | 2 +- internal/test_unit/config/PointStatConfig_qty_inc_exc | 2 +- internal/test_unit/config/PointStatConfig_sid_inc_exc | 2 +- internal/test_unit/config/WaveletStatConfig | 2 +- internal/test_unit/config/WaveletStatConfig_no_thresholds | 2 +- internal/test_unit/config/WaveletStatConfig_python | 2 +- internal/test_unit/config/WaveletStatConfig_python_mixed | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/internal/test_unit/config/EnsembleStatConfig b/internal/test_unit/config/EnsembleStatConfig index fdcd370b7f..80157bed0c 100644 --- 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 index 2a1e778b04..96128cb148 100644 --- 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 index 0d11408904..633ab775f9 100644 --- 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 index 08bf826bd1..9915c3fa37 100644 --- 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 index 57031acdce..013763c74d 100644 --- 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 index 66ff5edb5d..0881ff3b8d 100644 --- 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 index 326c6b55aa..9a565c2fb4 100644 --- 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 index 7236c64a1c..b23708ab46 100644 --- 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 index caa5a2a59a..74bbba5b4d 100644 --- 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 index e50b248914..8a23c76c45 100644 --- 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 index 03723c0a74..ddef797d2e 100644 --- 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 index 4e828f4192..44ed5f564f 100644 --- 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 index daaa43ec02..71d165e98a 100644 --- 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 diff --git a/internal/test_unit/config/MODEConfig_cut_line b/internal/test_unit/config/MODEConfig_cut_line index 8bd98820f2..81658982c4 100644 --- a/internal/test_unit/config/MODEConfig_cut_line +++ b/internal/test_unit/config/MODEConfig_cut_line @@ -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/MODEConfig_hmt b/internal/test_unit/config/MODEConfig_hmt index 60ea3d5043..abfcd961aa 100644 --- a/internal/test_unit/config/MODEConfig_hmt +++ b/internal/test_unit/config/MODEConfig_hmt @@ -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/MODEConfig_multivar_fake_data b/internal/test_unit/config/MODEConfig_multivar_fake_data index f391ee07df..fa46e066b2 100644 --- a/internal/test_unit/config/MODEConfig_multivar_fake_data +++ b/internal/test_unit/config/MODEConfig_multivar_fake_data @@ -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/MODEConfig_multivar_fake_data_with_intensities b/internal/test_unit/config/MODEConfig_multivar_fake_data_with_intensities index 4591156fe5..7230ecf817 100644 --- a/internal/test_unit/config/MODEConfig_multivar_fake_data_with_intensities +++ b/internal/test_unit/config/MODEConfig_multivar_fake_data_with_intensities @@ -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/MODEConfig_perc_thresh b/internal/test_unit/config/MODEConfig_perc_thresh index f8fc43b254..22f8c4938e 100644 --- a/internal/test_unit/config/MODEConfig_perc_thresh +++ b/internal/test_unit/config/MODEConfig_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/MODEConfig_python b/internal/test_unit/config/MODEConfig_python index 23dea05343..9fd55471b9 100644 --- a/internal/test_unit/config/MODEConfig_python +++ b/internal/test_unit/config/MODEConfig_python @@ -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/MODEConfig_python_mixed b/internal/test_unit/config/MODEConfig_python_mixed index a887a38093..ad59671837 100644 --- a/internal/test_unit/config/MODEConfig_python_mixed +++ b/internal/test_unit/config/MODEConfig_python_mixed @@ -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/MODEConfig_quilt b/internal/test_unit/config/MODEConfig_quilt index 2b98d7988b..a8561aed9d 100644 --- a/internal/test_unit/config/MODEConfig_quilt +++ b/internal/test_unit/config/MODEConfig_quilt @@ -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/MTDConfig_simple b/internal/test_unit/config/MTDConfig_simple index dd90c8806f..920606c433 100644 --- a/internal/test_unit/config/MTDConfig_simple +++ b/internal/test_unit/config/MTDConfig_simple @@ -10,7 +10,7 @@ // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/internal/test_unit/config/PointStatConfig_APCP b/internal/test_unit/config/PointStatConfig_APCP index 7f67f5cf8f..a6a6f06d64 100644 --- a/internal/test_unit/config/PointStatConfig_APCP +++ b/internal/test_unit/config/PointStatConfig_APCP @@ -6,7 +6,7 @@ // //////////////////////////////////////////////////////////////////////////////// -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/internal/test_unit/config/PointStatConfig_APCP_HIRA b/internal/test_unit/config/PointStatConfig_APCP_HIRA index 7debd797d3..3dc823a50b 100644 --- a/internal/test_unit/config/PointStatConfig_APCP_HIRA +++ b/internal/test_unit/config/PointStatConfig_APCP_HIRA @@ -6,7 +6,7 @@ // //////////////////////////////////////////////////////////////////////////////// -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/internal/test_unit/config/PointStatConfig_LAND_TOPO_MASK b/internal/test_unit/config/PointStatConfig_LAND_TOPO_MASK index 57841b0dae..48a04ed227 100644 --- a/internal/test_unit/config/PointStatConfig_LAND_TOPO_MASK +++ b/internal/test_unit/config/PointStatConfig_LAND_TOPO_MASK @@ -6,7 +6,7 @@ // //////////////////////////////////////////////////////////////////////////////// -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/internal/test_unit/config/PointStatConfig_MASK_SID b/internal/test_unit/config/PointStatConfig_MASK_SID index 2dae93f005..a77a8f9008 100644 --- a/internal/test_unit/config/PointStatConfig_MASK_SID +++ b/internal/test_unit/config/PointStatConfig_MASK_SID @@ -6,7 +6,7 @@ // //////////////////////////////////////////////////////////////////////////////// -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/internal/test_unit/config/PointStatConfig_PHYS b/internal/test_unit/config/PointStatConfig_PHYS index 7a1c51134b..3c13262a71 100644 --- a/internal/test_unit/config/PointStatConfig_PHYS +++ b/internal/test_unit/config/PointStatConfig_PHYS @@ -6,7 +6,7 @@ // //////////////////////////////////////////////////////////////////////////////// -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/internal/test_unit/config/PointStatConfig_PHYS_pint b/internal/test_unit/config/PointStatConfig_PHYS_pint index 58b8e5cba6..e246c570b3 100644 --- a/internal/test_unit/config/PointStatConfig_PHYS_pint +++ b/internal/test_unit/config/PointStatConfig_PHYS_pint @@ -6,7 +6,7 @@ // //////////////////////////////////////////////////////////////////////////////// -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/internal/test_unit/config/PointStatConfig_WINDS b/internal/test_unit/config/PointStatConfig_WINDS index d856492fd4..1c87273e89 100644 --- a/internal/test_unit/config/PointStatConfig_WINDS +++ b/internal/test_unit/config/PointStatConfig_WINDS @@ -6,7 +6,7 @@ // //////////////////////////////////////////////////////////////////////////////// -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/internal/test_unit/config/PointStatConfig_dup b/internal/test_unit/config/PointStatConfig_dup index 9f65ae8cfd..8fad74b0e5 100644 --- a/internal/test_unit/config/PointStatConfig_dup +++ b/internal/test_unit/config/PointStatConfig_dup @@ -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/PointStatConfig_obs_summary b/internal/test_unit/config/PointStatConfig_obs_summary index 275f6fb963..a931ba6b21 100644 --- a/internal/test_unit/config/PointStatConfig_obs_summary +++ b/internal/test_unit/config/PointStatConfig_obs_summary @@ -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/PointStatConfig_obs_summary_all b/internal/test_unit/config/PointStatConfig_obs_summary_all index 34e01fdd4f..384e4ada19 100644 --- a/internal/test_unit/config/PointStatConfig_obs_summary_all +++ b/internal/test_unit/config/PointStatConfig_obs_summary_all @@ -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/PointStatConfig_prob b/internal/test_unit/config/PointStatConfig_prob index 1a1c73f749..ab8067a79e 100644 --- a/internal/test_unit/config/PointStatConfig_prob +++ b/internal/test_unit/config/PointStatConfig_prob @@ -6,7 +6,7 @@ // //////////////////////////////////////////////////////////////////////////////// -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/internal/test_unit/config/PointStatConfig_python b/internal/test_unit/config/PointStatConfig_python index 13e736396e..5116179451 100644 --- a/internal/test_unit/config/PointStatConfig_python +++ b/internal/test_unit/config/PointStatConfig_python @@ -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/PointStatConfig_qty_inc_exc b/internal/test_unit/config/PointStatConfig_qty_inc_exc index 7939151307..1eab2b184c 100644 --- a/internal/test_unit/config/PointStatConfig_qty_inc_exc +++ b/internal/test_unit/config/PointStatConfig_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/PointStatConfig_sid_inc_exc b/internal/test_unit/config/PointStatConfig_sid_inc_exc index 2705529d04..a586064f53 100644 --- a/internal/test_unit/config/PointStatConfig_sid_inc_exc +++ b/internal/test_unit/config/PointStatConfig_sid_inc_exc @@ -6,7 +6,7 @@ // //////////////////////////////////////////////////////////////////////////////// -model = "WRF"; +model = "FCST"; // // Output description to be written diff --git a/internal/test_unit/config/WaveletStatConfig b/internal/test_unit/config/WaveletStatConfig index 66c9fb64ab..d577cdc721 100644 --- a/internal/test_unit/config/WaveletStatConfig +++ b/internal/test_unit/config/WaveletStatConfig @@ -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/WaveletStatConfig_no_thresholds b/internal/test_unit/config/WaveletStatConfig_no_thresholds index 8d51a464d8..ccc5787736 100644 --- a/internal/test_unit/config/WaveletStatConfig_no_thresholds +++ b/internal/test_unit/config/WaveletStatConfig_no_thresholds @@ -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/WaveletStatConfig_python b/internal/test_unit/config/WaveletStatConfig_python index 980c80a2dd..30d963e0d0 100644 --- a/internal/test_unit/config/WaveletStatConfig_python +++ b/internal/test_unit/config/WaveletStatConfig_python @@ -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/WaveletStatConfig_python_mixed b/internal/test_unit/config/WaveletStatConfig_python_mixed index 1dda90d7ca..d496ebb2df 100644 --- a/internal/test_unit/config/WaveletStatConfig_python_mixed +++ b/internal/test_unit/config/WaveletStatConfig_python_mixed @@ -9,7 +9,7 @@ // // Output model name to be written // -model = "WRF"; +model = "FCST"; // // Output description to be written From a4db9c6d17dfcdb66e290ae6e6de213feedc458a Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 15 Sep 2023 09:59:16 -0600 Subject: [PATCH 4/5] Per #2682, change model from "WRF" to "FCST" throughout the User's Guide as well. --- docs/Users_Guide/config_options.rst | 2 +- docs/Users_Guide/ensemble-stat.rst | 2 +- docs/Users_Guide/gen-ens-prod.rst | 2 +- docs/Users_Guide/grid-stat.rst | 2 +- docs/Users_Guide/mode-td.rst | 2 +- docs/Users_Guide/mode.rst | 2 +- docs/Users_Guide/point-stat.rst | 2 +- docs/Users_Guide/series-analysis.rst | 2 +- docs/Users_Guide/wavelet-stat.rst | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/Users_Guide/config_options.rst b/docs/Users_Guide/config_options.rst index 48be5c556a..2bba1cc0ac 100644 --- 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/ensemble-stat.rst b/docs/Users_Guide/ensemble-stat.rst index 0972250627..7cba057a69 100644 --- 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 index babb8e0ed4..7c581d2baf 100644 --- 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 index 55d9daaa4b..61c6ccb5db 100644 --- 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 index bbda4dc315..e205ccba36 100644 --- 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 index f5d9c4e609..98ab658ea4 100644 --- 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 index e4f0e7eeda..1fd88668a9 100644 --- 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 index 2b0b391d24..1dd568fcda 100644 --- 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/wavelet-stat.rst b/docs/Users_Guide/wavelet-stat.rst index 3622a4ff7a..b9a1aa7a76 100644 --- 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 = { ... } From c92898bb6a34656f18a0c2099128bfb043933378 Mon Sep 17 00:00:00 2001 From: John Halley Gotway Date: Fri, 15 Sep 2023 10:28:09 -0600 Subject: [PATCH 5/5] Per #2682, fix bug in the order of columns in listHeaderCols. --- internal/test_unit/R_test/test_util.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/test_unit/R_test/test_util.R b/internal/test_unit/R_test/test_util.R index bcbeb14e71..7d83360ecd 100644 --- 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",