Feature 1371 blocking wr (#1426)

dtcenter · Feb 9, 2022 · f3341ab · f3341ab
1 parent 6d69531
commit f3341ab
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 804 deletions.
diff --git a/.github/parm/use_case_groups.json b/.github/parm/use_case_groups.json
@@ -127,7 +127,7 @@
   {
     "category": "s2s",
     "index_list": "1-3",
-    "run": false
+    "run": true
   },
   {
     "category": "s2s",
@@ -157,7 +157,7 @@
   {
     "category": "s2s",
     "index_list": "11",
-    "run": false
+    "run": true
   },
   {
     "category": "s2s",

diff --git a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/Blocking.py b/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/Blocking.py
diff --git a/.../model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/Blocking_WeatherRegime_util.py b/.../model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/Blocking_WeatherRegime_util.py
diff --git a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.conf b/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.conf
@@ -2,9 +2,8 @@
 [config]
 # All steps, including pre-processing:
 # PROCESS_LIST = RegridDataPlane(regrid_obs), PcpCombine(daily_mean_obs), UserScript(script_wr), StatAnalysis(sanal_wrclass), StatAnalysis(sanal_wrfreq)
-# Weather Regime Analysis only:
-#PROCESS_LIST = UserScript(script_wr), StatAnalysis(sanal_wrclass), StatAnalysis(sanal_wrfreq)
-PROCESS_LIST = UserScript(script_wr)
+# Weather Regime Analysis and stat_analysis:
+PROCESS_LIST = UserScript(script_wr), StatAnalysis(sanal_wrclass), StatAnalysis(sanal_wrfreq)
 
 # time looping - options are INIT, VALID, RETRO, and REALTIME
 # If set to INIT or RETRO:
@@ -178,6 +177,13 @@ FCST_NUM_PCS = {OBS_NUM_PCS}
 OBS_WR_FREQ = 7
 FCST_WR_FREQ = {OBS_WR_FREQ}
 
+# These variables control reordering the forecast weather regime to match the
+# observations if their orders are different
+# It is recommended to set this to False if this is the first time running the
+# case
+REORDER_FCST = True
+FCST_ORDER = 1,3,4,2,5,6
+
 # Type, name and directory of Output File for weather regime classification
 # Type options are text or netcdf
 OBS_WR_OUTPUT_FILE_TYPE = text

diff --git a/...l_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/Blocking_WeatherRegime_util.py b/...l_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/Blocking_WeatherRegime_util.py
diff --git a/...use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime.py b/...use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime.py