Feature 1694 s2s subgroups (#1697)

* per #1694, moved 4 use cases from s2s to s2s_mjo, updated paths accordingly, and turned on all s2s use cases to test that they all run successfully after the changes * per #1694, fixed paths to s2s_mjo conf files * updated documentation for use cases that were moved from s2s to s2s_mjo * attempt to free up unused disk space in GHA runner environment * moved 4 s2s use cases into s2s_mid_lat * added new model application categories to contrib guide for adding new use cases * per #947, changed convection_allowing_models use cases to short_range * changed which use case tests run to the ones that are failing and added other METdbLoad use case to see if that fails as well * test to determine which files are preventing MySQL database from being created properly * test 2 to determine which files are preventing MySQL database from being created properly * test 3 to see if removing these files is not the cause of the METdbLoad failure * updated references to METdatadb to METdataio since the repository was renamed * fixed typo * changed path to sql file needed to create database because it was moved from METviewer to METdataio * fixed path to sql file that was moved from METviewer to METdataio * removed temporary fix because metdataio conda env was created in the dtcenter/metplus-envs:metdataio Docker image * added note to update path when METviewer Dockerfile changes to reflect METdatadb rename to METdataio, ci-skip-unit-tests * fixed path to METdataio repo * add back commands to free up disk space because issue with METdbLoad use case was likely not related, ci-skip-unit-tests * run all tests with ci-run-all-diff * remove use case group added for testing, ci-skip-all * changed exit code for diff tests to 2 so it is easier to see if a use case test job failed due to an actual failure or due to differences in the output * changed grouping of s2s mid lat use cases to original grouping to prevent warning that artifact contains more than 10,000 files. The 2 WeatherRegime use cases produce a lot of output files, so splitting them up should resolve this warning * per #1694, changed all references to convection allowing models to short range in the Verification Datasets section of the documentation * changed URLs to develop version of documentation to a URL relative to the current version of the documentation to match the quick search links from the METplus User's Guide * per #947, changed references to convection_allowing_model (without the s) to short_range that were missed * updated use case test scripts to rename convection_allowing_models to short_range and added note to alert developers that the list of use cases in the script is not maintained and therefore not complete
dtcenter · Jul 18, 2022 · a20c0bb · a20c0bb
1 parent 2da1f91
commit a20c0bb
Show file tree

Hide file tree

Showing 99 changed files with 435 additions and 400 deletions.
diff --git a/.github/jobs/free_disk_space.sh b/.github/jobs/free_disk_space.sh
@@ -11,4 +11,5 @@ sudo rm -rf "/usr/local/share/boost"
 sudo rm -rf "$AGENT_TOOLSDIRECTORY"
 
 printf "\nChecking disk usage after cleanup"
+
 df -h
diff --git a/.github/jobs/get_metviewer.sh b/.github/jobs/get_metviewer.sh
@@ -21,7 +21,7 @@ sleep 20
 # print list of currently running containers to
 # verify mysql and metviewer are running
 docker ps -a
-
+# TODO: when METviewer Dockerfile changes METdatadb to METdataio, update path to sql file accordingly
 # commands to run inside METviewer container
 cmd="mysql -hmysql_mv -uroot -pmvuser -e\"create database mv_metplus_test;\";"
 cmd+="mysql -hmysql_mv -uroot -pmvuser mv_metplus_test < /METviewer-python/METdataio/METdbLoad/sql/mv_mysql.sql"

diff --git a/.github/jobs/get_use_case_commands.py b/.github/jobs/get_use_case_commands.py
@@ -72,13 +72,13 @@ def handle_automation_env(host_name, reqs, work_dir):
             'cd -;'
         )
 
-    # if metdatadb is in requirements list, add command to obtain METdatadb
-    if 'metdatadb' in str(reqs).lower():
+    # if metdataio is in requirements list, add command to obtain METdataio
+    if 'metdataio' in str(reqs).lower():
         setup_env += (
             f'cd {METPLUS_DOCKER_LOC};'
             f'{work_dir}/manage_externals/checkout_externals'
-            f' -e {work_dir}/.github/parm/Externals_metdatadb.cfg;'
-            f'{python_path} -m pip install {METPLUS_DOCKER_LOC}/../METdatadb;'
+            f' -e {work_dir}/.github/parm/Externals_metdataio.cfg;'
+            f'{python_path} -m pip install {METPLUS_DOCKER_LOC}/../METdataio;'
             'cd -;'
         )
 

diff --git a/.github/jobs/run_difference_tests.sh b/.github/jobs/run_difference_tests.sh
@@ -17,7 +17,7 @@ if [ "$( ls -A ${RUNNER_WORKSPACE}/diff)" ]; then
   echo ::set-output name=upload_diff::true
   mkdir -p artifact/diff-${artifact_name}
   cp -r ${RUNNER_WORKSPACE}/diff/* artifact/diff-${artifact_name}
-  exit 1
+  exit 2
 fi
 
 echo ::set-output name=upload_diff::false
diff --git a/.github/parm/Externals_metdatadb.cfg → .github/parm/Externals_metdataio.cfg b/.github/parm/Externals_metdatadb.cfg → .github/parm/Externals_metdataio.cfg
@@ -1,8 +1,8 @@
 [METdatadb]
-local_path = ../METdatadb
+local_path = ../METdataio
 protocol = git
 required = True
-repo_url = https://github.com/dtcenter/METdatadb
+repo_url = https://github.com/dtcenter/METdataio
 branch = develop
 
 [externals_description]

diff --git a/.github/parm/use_case_groups.json b/.github/parm/use_case_groups.json
@@ -25,32 +25,32 @@
     "run": false
   },
   {
-    "category": "convection_allowing_models",
+    "category": "short_range",
     "index_list": "0",
     "run": false
   },
   {
-    "category": "convection_allowing_models",
+    "category": "short_range",
     "index_list": "1",
     "run": false
   },
   {
-    "category": "convection_allowing_models",
+    "category": "short_range",
     "index_list": "2-6",
     "run": false
   },
   {
-    "category": "convection_allowing_models",
+    "category": "short_range",
     "index_list": "7",
     "run": false
   },
   {
-    "category": "convection_allowing_models",
+    "category": "short_range",
     "index_list": "8",
     "run": false
   },
   {
-    "category": "convection_allowing_models",
+    "category": "short_range",
     "index_list": "9",
     "run": false
   },
@@ -136,52 +136,52 @@
   },
   {
     "category": "s2s",
-    "index_list": "1-3",
+    "index_list": "1",
     "run": false
   },
   {
     "category": "s2s",
-    "index_list": "4",
+    "index_list": "2",
     "run": false
   },
   {
     "category": "s2s",
-    "index_list": "5",
+    "index_list": "3",
     "run": false
   },
   {
     "category": "s2s",
-    "index_list": "6-7",
+    "index_list": "4",
     "run": false
   },
   {
     "category": "s2s",
-    "index_list": "7-9",
+    "index_list": "5",
     "run": false
   },
   {
     "category": "s2s",
-    "index_list": "10",
+    "index_list": "6",
     "run": false
   },
   {
-    "category": "s2s",
-    "index_list": "11",
+    "category": "s2s_mid_lat",
+    "index_list": "0-2",
     "run": false
   },
   {
-    "category": "s2s",
-    "index_list": "12",
-    "run": false 
+    "category": "s2s_mid_lat",
+    "index_list": "3",
+    "run": false
   },
   {
-    "category": "s2s",
-    "index_list": "13",
+    "category": "s2s_mjo",
+    "index_list": "0-2",
     "run": false
   },
   {
-    "category": "s2s",
-    "index_list": "14",
+    "category": "s2s_mjo",
+    "index_list": "3",
     "run": false
   },
   {

diff --git a/docs/Contributors_Guide/add_use_case.rst b/docs/Contributors_Guide/add_use_case.rst
@@ -42,7 +42,6 @@ one of the following:
 
 * air_quality_and_comp
 * climate
-* convection_allowing_models
 * data_assimilation
 * extremes
 * land_surface
@@ -52,6 +51,9 @@ one of the following:
 * pbl
 * precipitation
 * s2s (Subseasonal to Seasonal)
+* s2s_mid_lat (Subseasonal to Seasonal: Mid-Latitude)
+* s2s_mjo (Subseasonal to Seasonal: Madden-Julian Oscillation)
+* short_range (formerly convection_allowing_models)
 * space_weather
 * tc_and_extra_tc (Tropical Cyclone and Extratropical Cyclone)
 

diff --git a/docs/Users_Guide/quicksearch.rst b/docs/Users_Guide/quicksearch.rst
@@ -70,28 +70,32 @@ Use Cases by Application:
 
    | `Air Quality and Composition <../search.html?q=AirQualityAndCompAppUseCase&check_keywords=yes&area=default>`_
    | `Climate <../search.html?q=ClimateAppUseCase&check_keywords=yes&area=default>`_
-   | `Convection Allowing Models <../search.html?q=ConvectionAllowingModelsAppUseCase&check_keywords=yes&area=default>`_
+   | `Short Range <../search.html?q=ShortRangeAppUseCase&check_keywords=yes&area=default>`_
    | `Data Assimilation  <../search.html?q=DataAssimilationAppUseCase&check_keywords=yes&area=default>`_
    | `Ensemble  <../search.html?q=EnsembleAppUseCase&check_keywords=yes&area=default>`_
    | `Marine and Cryosphere <../search.html?q=MarineAndCryosphereAppUseCase&check_keywords=yes&area=default>`_
    | `Medium Range <../search.html?q=MediumRangeAppUseCase&check_keywords=yes&area=default>`_
    | `Precipitation <../search.html?q=PrecipitationAppUseCase&check_keywords=yes&area=default>`_
    | `Space Weather <../search.html?q=SpaceWeatherAppUseCase&check_keywords=yes&area=default>`_
    | `Subseasonal to Seasonal <../search.html?q=S2SAppUseCase&check_keywords=yes&area=default>`_
+   | `Subseasonal to Seasonal: Madden-Julian Oscillation <../search.html?q=S2SMJOAppUseCase&check_keywords=yes&area=default>`_
+   | `Subseasonal to Seasonal: Mid-Latitude <../search.html?q=S2SMidLatAppUseCase&check_keywords=yes&area=default>`_
    | `Tropical Cyclone and Extra-Tropical Cyclone <../search.html?q=TCandExtraTCAppUseCase&check_keywords=yes&area=default>`_
 
 .. only:: latex
 
    | **Air Quality and Composition**: *AirQualityAndCompAppUseCase*
    | **Climate**: *ClimateAppUseCase*
-   | **Convection Allowing Models**: *ConvectionAllowingModelsAppUseCase*
+   | **Short Range**: *ShortRangeAppUseCase*
    | **Data Assimilation**: *DataAssimilationAppUseCase*
    | **Ensemble**: *EnsembleAppUseCase*
    | **Marine and Cryosphere**: *MarineAndCryosphereAppUseCase*
    | **Medium Range**: *MediumRangeAppUseCase*
    | **Precipitation**: *PrecipitationAppUseCase*
    | **Space Weather**: *SpaceWeatherAppUseCase*
    | **Subseasonal to Seasonal**: *S2SAppUseCase*
+   | **Subseasonal to Seasonal: Madden-Julian Oscillation**: *S2SMJOAppUseCase*
+   | **Subseasonal to Seasonal: Mid-Latitude**: *S2SMidLatAppUseCase*
    | **Tropical Cyclone and Extra-Tropical Cyclone**: *TCandExtraTCAppUseCase*
 
 Use Cases by Organization:

diff --git a/docs/Verification_Datasets/datasets/aeronet.rst b/docs/Verification_Datasets/datasets/aeronet.rst
@@ -52,4 +52,4 @@ METplus Use Cases
 Keywords
   .. note:: **Current Dataset:** VxDataAERONET
 
-  .. note:: **Data Labels:** DataTypePoint, DataLevelSurface, DataLevelUpperAir, DataProviderNASA, DataApplicationConvectionAllowingModels, DataApplicationMediumRange
+  .. note:: **Data Labels:** DataTypePoint, DataLevelSurface, DataLevelUpperAir, DataProviderNASA, DataApplicationShortRange, DataApplicationMediumRange
diff --git a/docs/Verification_Datasets/datasets/gdas_prepbufr.rst b/docs/Verification_Datasets/datasets/gdas_prepbufr.rst
@@ -48,4 +48,4 @@ METplus Use Cases
 Keywords
   .. note:: **Current Dataset:** VxDataGDASPREP
 
-  .. note:: **Data Labels:** DataTypePoint, DataLevelSurface, DataLevelUpperAir, DataProviderNOAA, DataApplicationConvectionAllowingModels, DataApplicationMediumRange
+  .. note:: **Data Labels:** DataTypePoint, DataLevelSurface, DataLevelUpperAir, DataProviderNOAA, DataApplicationShortRange, DataApplicationMediumRange
diff --git a/docs/Verification_Datasets/datasets/goes_level_1b.rst b/docs/Verification_Datasets/datasets/goes_level_1b.rst
@@ -57,4 +57,4 @@ METplus Use Cases
 Keywords
   .. note:: **Current Dataset:** VxDataGOESLEV1B
 
-  .. note:: **Data Labels:** DataTypeGridded, DataLevelSatellite, DataProviderNASA, DataApplicationConvectionAllowingModels
+  .. note:: **Data Labels:** DataTypeGridded, DataLevelSatellite, DataProviderNASA, DataApplicationShortRange
diff --git a/docs/Verification_Datasets/datasets/goes_level_2_aerosol.rst b/docs/Verification_Datasets/datasets/goes_level_2_aerosol.rst
@@ -63,4 +63,4 @@ METplus Use Cases
 Keywords
   .. note:: **Current Dataset:** VxDataGOESLEV2AERO
 
-  .. note:: **Data Labels:** DataTypeGridded, DataLevelSatellite, DataProviderNASA, DataApplicationConvectionAllowingModels
+  .. note:: **Data Labels:** DataTypeGridded, DataLevelSatellite, DataProviderNASA, DataApplicationShortRange
diff --git a/docs/Verification_Datasets/datasets/madis.rst b/docs/Verification_Datasets/datasets/madis.rst
@@ -47,4 +47,4 @@ METplus Use Cases
 Keywords
   .. note:: **Current Dataset:** VxDataMADIS
 
-  .. note:: **Data Labels:** DataTypePoint, DataLevelSurface, DataProviderNOAA, DataApplicationPrecipitation, DataApplicationConvectionAllowingModels, DataApplicationMediumRange
+  .. note:: **Data Labels:** DataTypePoint, DataLevelSurface, DataProviderNOAA, DataApplicationPrecipitation, DataApplicationShortRange, DataApplicationMediumRange
diff --git a/docs/Verification_Datasets/datasets/metar_isu.rst b/docs/Verification_Datasets/datasets/metar_isu.rst
@@ -46,4 +46,4 @@ METplus Use Cases
 Keywords
   .. note:: **Current Dataset:** VxDataMETAR
 
-  .. note:: **Data Labels:** DataTypePoint, DataLevelSurface, DataProviderISU, DataApplicationPrecipitation, DataApplicationConvectionAllowingModels, DataApplicationMediumRange
+  .. note:: **Data Labels:** DataTypePoint, DataLevelSurface, DataProviderISU, DataApplicationPrecipitation, DataApplicationShortRange, DataApplicationMediumRange
diff --git a/docs/Verification_Datasets/datasets/mping.rst b/docs/Verification_Datasets/datasets/mping.rst
@@ -48,4 +48,4 @@ METplus Use Cases
 Keywords
   .. note:: **Current Dataset:** VxDataMPING
 
-  .. note:: **Data Labels:** DataTypePoint, DataLevelSurface, DataProviderOU, DataApplicationPrecipitation, DataApplicationConvectionAllowingModels
+  .. note:: **Data Labels:** DataTypePoint, DataLevelSurface, DataProviderOU, DataApplicationPrecipitation, DataApplicationShortRange
diff --git a/docs/Verification_Datasets/datasets/mrms_composite_reflectivity.rst b/docs/Verification_Datasets/datasets/mrms_composite_reflectivity.rst
@@ -41,4 +41,4 @@ METplus Use Cases
 Keywords
   .. note:: **Current Dataset:** VxDataMRMSCompositeReflectivity
 
-  .. note:: **Data Labels:** DataTypeGridded, DataLevelSurface, DataProviderNOAA, DataApplicationConvectionAllowingModels
+  .. note:: **Data Labels:** DataTypeGridded, DataLevelSurface, DataProviderNOAA, DataApplicationShortRange
diff --git a/docs/Verification_Datasets/datasets/nexrad_level_2.rst b/docs/Verification_Datasets/datasets/nexrad_level_2.rst
@@ -49,4 +49,4 @@ METplus Use Cases
 Keywords
   .. note:: **Current Dataset:** VxDataNexradLevel2
 
-  .. note:: **Data Labels:** DataTypeGridded, DataLevelSurface, DataProviderNOAA, DataApplicationConvectionAllowingModels, DataApplicationMediumRange
+  .. note:: **Data Labels:** DataTypeGridded, DataLevelSurface, DataProviderNOAA, DataApplicationShortRange, DataApplicationMediumRange
diff --git a/docs/Verification_Datasets/datasets/nexrad_level_3.rst b/docs/Verification_Datasets/datasets/nexrad_level_3.rst
@@ -52,4 +52,4 @@ METplus Use Cases
 Keywords
   .. note:: **Current Dataset:** VxDataNexradLevel3
 
-  .. note:: **Data Type Labels:** DataTypeGridded, DataLevelSurface, DataProviderNOAA, DataApplicationConvectionAllowingModels, DataApplicationMediumRange
+  .. note:: **Data Type Labels:** DataTypeGridded, DataLevelSurface, DataProviderNOAA, DataApplicationShortRange, DataApplicationMediumRange
diff --git a/docs/Verification_Datasets/datasets/opera_eumetnet.rst b/docs/Verification_Datasets/datasets/opera_eumetnet.rst
@@ -51,4 +51,4 @@ METplus Use Cases
 Keywords
   .. note:: **Current Dataset:** VxDataOperaEumetnet
 
-  .. note:: **Data Labels:** DataTypeGridded, DataLevelSurface, DataProviderEUMETNET, DataApplicationPrecipitation, DataApplicationConvectionAllowingModels
+  .. note:: **Data Labels:** DataTypeGridded, DataLevelSurface, DataProviderEUMETNET, DataApplicationPrecipitation, DataApplicationShortRange
diff --git a/docs/Verification_Datasets/datasets/template.rst b/docs/Verification_Datasets/datasets/template.rst
@@ -80,7 +80,7 @@ Keywords
       DataProviderUSAF
     Select at least one DataApplication label:
       DataApplicationClimate
-      DataApplicationConvectionAllowingModels
+      DataApplicationShortRange
       DataApplicationEnsemble
       DataApplicationMarineAndCryo
       DataApplicationMediumRange

diff --git a/docs/Verification_Datasets/datasets/viirs.rst b/docs/Verification_Datasets/datasets/viirs.rst
@@ -52,4 +52,4 @@ METplus Use Cases
 
 Keywords
   .. note:: **Current Dataset:** VxDataVIIRS
-  .. note:: **Data Labels:** DataTypeGridded, DataLevelSatellite, DataProviderNASA, DataApplicationConvectionAllowingModels, DataApplicationMediumRange
+  .. note:: **Data Labels:** DataTypeGridded, DataLevelSatellite, DataProviderNASA, DataApplicationShortRange, DataApplicationMediumRange
diff --git a/docs/Verification_Datasets/quicksearch.rst b/docs/Verification_Datasets/quicksearch.rst
@@ -5,33 +5,33 @@ Quick Search for Datasets
 
 Dataset Types
 -------------
-| `Point Data <https://metplus.readthedocs.io/en/develop/search.html?q=DataTypePoint&check_keywords=yes&area=default>`_
-| `Gridded Data <https://metplus.readthedocs.io/en/develop/search.html?q=DataTypeGridded&check_keywords=yes&area=default>`_
+| `Point Data <../search.html?q=DataTypePoint&check_keywords=yes&area=default>`_
+| `Gridded Data <../search.html?q=DataTypeGridded&check_keywords=yes&area=default>`_
 
 Dataset Levels 
 --------------
-| `Surface Data <https://metplus.readthedocs.io/en/develop/search.html?q=DataLevelSurface&check_keywords=yes&area=default>`_
-| `Upper-Air Data <https://metplus.readthedocs.io/en/develop/search.html?q=DataLevelUpperAir&check_keywords=yes&area=default>`_
-| `Satellite Data <https://metplus.readthedocs.io/en/develop/search.html?q=DataLevelSatellite&check_keywords=yes&area=default>`_
+| `Surface Data <../search.html?q=DataLevelSurface&check_keywords=yes&area=default>`_
+| `Upper-Air Data <../search.html?q=DataLevelUpperAir&check_keywords=yes&area=default>`_
+| `Satellite Data <../search.html?q=DataLevelSatellite&check_keywords=yes&area=default>`_
 
 Dataset Providers 
 -----------------
-| `EUMETNET <https://metplus.readthedocs.io/en/develop/search.html?q=DataProviderEUMETNET&check_keywords=yes&area=default>`_
-| `ISU <https://metplus.readthedocs.io/en/develop/search.html?q=DataProviderISU&check_keywords=yes&area=default>`_
-| `NOAA <https://metplus.readthedocs.io/en/develop/search.html?q=DataProviderNOAA&check_keywords=yes&area=default>`_
-| `NASA <https://metplus.readthedocs.io/en/develop/search.html?q=DataProviderNASA&check_keywords=yes&area=default>`_
-| `OU <https://metplus.readthedocs.io/en/develop/search.html?q=DataProviderOU&check_keywords=yes&area=default>`_
-| `USAF <https://metplus.readthedocs.io/en/develop/search.html?q=DataProviderUSAF&check_keywords=yes&area=default>`_
-| `NSIDC <https://metplus.readthedocs.io/en/develop/search.html?q=DataProviderNSIDC&check_keywords=yes&area=default>`_ 
+| `EUMETNET <../search.html?q=DataProviderEUMETNET&check_keywords=yes&area=default>`_
+| `ISU <../search.html?q=DataProviderISU&check_keywords=yes&area=default>`_
+| `NOAA <../search.html?q=DataProviderNOAA&check_keywords=yes&area=default>`_
+| `NASA <../search.html?q=DataProviderNASA&check_keywords=yes&area=default>`_
+| `OU <../search.html?q=DataProviderOU&check_keywords=yes&area=default>`_
+| `USAF <../search.html?q=DataProviderUSAF&check_keywords=yes&area=default>`_
+| `NSIDC <../search.html?q=DataProviderNSIDC&check_keywords=yes&area=default>`_
 
 Dataset Applications
 --------------------
-| `Climate <https://metplus.readthedocs.io/en/develop/search.html?q=DataApplicationClimate&check_keywords=yes&area=default>`_
-| `Convection Allowing Models <https://metplus.readthedocs.io/en/develop/search.html?q=DataApplicationConvectionAllowingModels&check_keywords=yes&area=default>`_
-| `Ensemble  <https://metplus.readthedocs.io/en/develop/search.html?q=DataApplicationEnsemble&check_keywords=yes&area=default>`_
-| `Marine and Cryosphere <https://metplus.readthedocs.io/en/develop/search.html?q=DataApplicationMarineAndCryo&check_keywords=yes&area=default>`_
-| `Medium Range <https://metplus.readthedocs.io/en/develop/search.html?q=DataApplicationMediumRange&check_keywords=yes&area=default>`_
-| `Precipitation <https://metplus.readthedocs.io/en/develop/search.html?q=DataApplicationPrecipitation&check_keywords=yes&area=default>`_
-| `Space Weather <https://metplus.readthedocs.io/en/develop/search.html?q=DataApplicationSpaceWeather&check_keywords=yes&area=default>`_
-| `Subseasonal to Seasonal <https://metplus.readthedocs.io/en/develop/search.html?q=DataApplicationS2S&check_keywords=yes&area=default>`_
-| `Tropical Cyclone and Extra-Tropical Cyclone <https://metplus.readthedocs.io/en/develop/search.html?q=DataApplicationTCandExtraTC&check_keywords=yes&area=default>`_
+| `Climate <../search.html?q=DataApplicationClimate&check_keywords=yes&area=default>`_
+| `Ensemble  <../search.html?q=DataApplicationEnsemble&check_keywords=yes&area=default>`_
+| `Marine and Cryosphere <../search.html?q=DataApplicationMarineAndCryo&check_keywords=yes&area=default>`_
+| `Medium Range <../search.html?q=DataApplicationMediumRange&check_keywords=yes&area=default>`_
+| `Precipitation <../search.html?q=DataApplicationPrecipitation&check_keywords=yes&area=default>`_
+| `Short Range <../search.html?q=DataApplicationShortRange&check_keywords=yes&area=default>`_
+| `Space Weather <../search.html?q=DataApplicationSpaceWeather&check_keywords=yes&area=default>`_
+| `Subseasonal to Seasonal <../search.html?q=DataApplicationS2S&check_keywords=yes&area=default>`_
+| `Tropical Cyclone and Extra-Tropical Cyclone <../search.html?q=DataApplicationTCandExtraTC&check_keywords=yes&area=default>`_
diff --git a/docs/_static/s2s-IBL_frequency.png → ...at-UserScript_fcstGFS_obsERA_Blocking.png b/docs/_static/s2s-IBL_frequency.png → ...at-UserScript_fcstGFS_obsERA_Blocking.png
diff --git a/docs/_static/s2s-OBS_ERA_weather_regime.png → ...erScript_fcstGFS_obsERA_WeatherRegime.png b/docs/_static/s2s-OBS_ERA_weather_regime.png → ...erScript_fcstGFS_obsERA_WeatherRegime.png
diff --git a/...static/s2s-OBS_ERA_blocking_frequency.png → ...at-UserScript_obsERA_obsOnly_Blocking.png b/...static/s2s-OBS_ERA_blocking_frequency.png → ...at-UserScript_obsERA_obsOnly_Blocking.png
diff --git a/...tatic/s2s-OBS_ERA_weather_regime_freq.png → ...erScript_obsERA_obsOnly_WeatherRegime.png b/...tatic/s2s-OBS_ERA_weather_regime_freq.png → ...erScript_obsERA_obsOnly_WeatherRegime.png
diff --git a/docs/_static/s2s-OMI_GFS_phase_diagram.png → ...s2s_mjo-UserScript_fcstGFS_obsERA_OMI.png b/docs/_static/s2s-OMI_GFS_phase_diagram.png → ...s2s_mjo-UserScript_fcstGFS_obsERA_OMI.png
diff --git a/docs/_static/s2s-OMI_phase_diagram.png → ...s2s_mjo-UserScript_obsERA_obsOnly_OMI.png b/docs/_static/s2s-OMI_phase_diagram.png → ...s2s_mjo-UserScript_obsERA_obsOnly_OMI.png
diff --git a/docs/_static/s2s-PhaseDiagram.png → ...serScript_obsERA_obsOnly_PhaseDiagram.png b/docs/_static/s2s-PhaseDiagram.png → ...serScript_obsERA_obsOnly_PhaseDiagram.png
diff --git a/docs/_static/s2s-RMM_time_series.png → ...s2s_mjo-UserScript_obsERA_obsOnly_RMM.png b/docs/_static/s2s-RMM_time_series.png → ...s2s_mjo-UserScript_obsERA_obsOnly_RMM.png
diff --git a/...tat_fcstHRRRE_obsHRRRE_Sfc_MultiField.png → ...tat_fcstHRRRE_obsHRRRE_Sfc_MultiField.png b/...tat_fcstHRRRE_obsHRRRE_Sfc_MultiField.png → ...tat_fcstHRRRE_obsHRRRE_Sfc_MultiField.png
diff --git a/...tat_fcstHRRR_fcstOnly_SurrogateSevere.png → ...tat_fcstHRRR_fcstOnly_SurrogateSevere.png b/...tat_fcstHRRR_fcstOnly_SurrogateSevere.png → ...tat_fcstHRRR_fcstOnly_SurrogateSevere.png
diff --git a/...at_fcstFV3_obsGOES_BrightnessTempDmap.png → ...at_fcstFV3_obsGOES_BrightnessTempDmap.png b/...at_fcstFV3_obsGOES_BrightnessTempDmap.png → ...at_fcstFV3_obsGOES_BrightnessTempDmap.png
diff --git a/...dbLoad_fcstFV3_obsGoes_BrightnessTemp.png → ...dbLoad_fcstFV3_obsGoes_BrightnessTemp.png b/...dbLoad_fcstFV3_obsGoes_BrightnessTemp.png → ...dbLoad_fcstFV3_obsGoes_BrightnessTemp.png
diff --git a/...s-MODE_fcstFV3_obsGOES_BrightnessTemp.png → ...e-MODE_fcstFV3_obsGOES_BrightnessTemp.png b/...s-MODE_fcstFV3_obsGOES_BrightnessTemp.png → ...e-MODE_fcstFV3_obsGOES_BrightnessTemp.png
diff --git a/...DE_fcstFV3_obsGOES_BrightnessTempObjs.png → ...DE_fcstFV3_obsGOES_BrightnessTempObjs.png b/...DE_fcstFV3_obsGOES_BrightnessTempObjs.png → ...DE_fcstFV3_obsGOES_BrightnessTempObjs.png
diff --git a/...els-MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.png → ...nge-MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.png b/...els-MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.png → ...nge-MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.png
diff --git a/...g_models-MTD_fcstHREF_FcstOnly_Gempak.png → ...rt_range-MTD_fcstHREF_FcstOnly_Gempak.png b/...g_models-MTD_fcstHREF_FcstOnly_Gempak.png → ...rt_range-MTD_fcstHREF_FcstOnly_Gempak.png
diff --git a/...rid_obsLSR_ObsOnly_PracticallyPerfect.png → ...rid_obsLSR_ObsOnly_PracticallyPerfect.png b/...rid_obsLSR_ObsOnly_PracticallyPerfect.png → ...rid_obsLSR_ObsOnly_PracticallyPerfect.png
diff --git a/...convection_allowing_models-SS_PP_prob.png → docs/_static/short_range-SS_PP_prob.png b/...convection_allowing_models-SS_PP_prob.png → docs/_static/short_range-SS_PP_prob.png
diff --git a/docs/use_cases/model_applications/convection_allowing_models/README.rst b/docs/use_cases/model_applications/convection_allowing_models/README.rst
diff --git a/docs/use_cases/model_applications/s2s_mid_lat/README.rst b/docs/use_cases/model_applications/s2s_mid_lat/README.rst
@@ -0,0 +1,3 @@
+Subseasonal to Seasonal: Mid-Latitude
+-------------------------------------
+Subseasonal-to-Seasonal model configurations relating to middle latitudes