diff --git a/.github/jobs/free_disk_space.sh b/.github/jobs/free_disk_space.sh index 1f23dca025..cfe30cf06d 100755 --- 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 index f96752758c..2cf43010e4 100755 --- 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 index 63e86ce21e..debf7bc6bf 100755 --- 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 index d363b673d5..609fa570e7 100755 --- 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 b/.github/parm/Externals_metdataio.cfg similarity index 59% rename from .github/parm/Externals_metdatadb.cfg rename to .github/parm/Externals_metdataio.cfg index 888d20303c..59a20286bc 100644 --- a/.github/parm/Externals_metdatadb.cfg +++ b/.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 index 309205c397..2a4da1ef67 100644 --- 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 index c2a47054ff..c7ac6560cd 100644 --- 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 index 4249e3b38c..1c4070a668 100644 --- a/docs/Users_Guide/quicksearch.rst +++ b/docs/Users_Guide/quicksearch.rst @@ -70,7 +70,7 @@ 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>`_ @@ -78,13 +78,15 @@ Use Cases by Application: | `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* @@ -92,6 +94,8 @@ Use Cases by Application: | **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 index 80fcaa4e9f..08e9f10cec 100644 --- 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 index 231d08fb7e..4c2848de99 100644 --- 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 index e396908481..fda714672e 100644 --- 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 index 08d23128d1..c461f77d05 100644 --- 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 index 5d8d07556e..dcd42a0cdf 100644 --- 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 index e3ffef5ed8..1c2703ac11 100644 --- 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 index ed92a5479d..6d3b2e24cd 100644 --- 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 index c74faa8fe7..49b852b5d2 100644 --- 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 index c07e4a8718..e02e14ae37 100644 --- 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 index fb4051edc3..5212783e63 100644 --- 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 index 631ae695f2..7353e9912d 100644 --- 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 index 66db980211..2c6a13021b 100644 --- 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 index 0ba0fc2ff6..20f61c1567 100644 --- 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 index 722c4aa068..b199566291 100644 --- a/docs/Verification_Datasets/quicksearch.rst +++ b/docs/Verification_Datasets/quicksearch.rst @@ -5,33 +5,33 @@ Quick Search for Datasets Dataset Types ------------- -| `Point Data `_ -| `Gridded Data `_ +| `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 `_ -| `Upper-Air Data `_ -| `Satellite Data `_ +| `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 `_ -| `ISU `_ -| `NOAA `_ -| `NASA `_ -| `OU `_ -| `USAF `_ -| `NSIDC `_ +| `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 `_ -| `Convection Allowing Models `_ -| `Ensemble `_ -| `Marine and Cryosphere `_ -| `Medium Range `_ -| `Precipitation `_ -| `Space Weather `_ -| `Subseasonal to Seasonal `_ -| `Tropical Cyclone and Extra-Tropical Cyclone `_ +| `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 b/docs/_static/s2s_mid_lat-UserScript_fcstGFS_obsERA_Blocking.png similarity index 100% rename from docs/_static/s2s-IBL_frequency.png rename to docs/_static/s2s_mid_lat-UserScript_fcstGFS_obsERA_Blocking.png diff --git a/docs/_static/s2s-OBS_ERA_weather_regime.png b/docs/_static/s2s_mid_lat-UserScript_fcstGFS_obsERA_WeatherRegime.png similarity index 100% rename from docs/_static/s2s-OBS_ERA_weather_regime.png rename to docs/_static/s2s_mid_lat-UserScript_fcstGFS_obsERA_WeatherRegime.png diff --git a/docs/_static/s2s-OBS_ERA_blocking_frequency.png b/docs/_static/s2s_mid_lat-UserScript_obsERA_obsOnly_Blocking.png similarity index 100% rename from docs/_static/s2s-OBS_ERA_blocking_frequency.png rename to docs/_static/s2s_mid_lat-UserScript_obsERA_obsOnly_Blocking.png diff --git a/docs/_static/s2s-OBS_ERA_weather_regime_freq.png b/docs/_static/s2s_mid_lat-UserScript_obsERA_obsOnly_WeatherRegime.png similarity index 100% rename from docs/_static/s2s-OBS_ERA_weather_regime_freq.png rename to docs/_static/s2s_mid_lat-UserScript_obsERA_obsOnly_WeatherRegime.png diff --git a/docs/_static/s2s-OMI_GFS_phase_diagram.png b/docs/_static/s2s_mjo-UserScript_fcstGFS_obsERA_OMI.png similarity index 100% rename from docs/_static/s2s-OMI_GFS_phase_diagram.png rename to docs/_static/s2s_mjo-UserScript_fcstGFS_obsERA_OMI.png diff --git a/docs/_static/s2s-OMI_phase_diagram.png b/docs/_static/s2s_mjo-UserScript_obsERA_obsOnly_OMI.png similarity index 100% rename from docs/_static/s2s-OMI_phase_diagram.png rename to docs/_static/s2s_mjo-UserScript_obsERA_obsOnly_OMI.png diff --git a/docs/_static/s2s-PhaseDiagram.png b/docs/_static/s2s_mjo-UserScript_obsERA_obsOnly_PhaseDiagram.png similarity index 100% rename from docs/_static/s2s-PhaseDiagram.png rename to docs/_static/s2s_mjo-UserScript_obsERA_obsOnly_PhaseDiagram.png diff --git a/docs/_static/s2s-RMM_time_series.png b/docs/_static/s2s_mjo-UserScript_obsERA_obsOnly_RMM.png similarity index 100% rename from docs/_static/s2s-RMM_time_series.png rename to docs/_static/s2s_mjo-UserScript_obsERA_obsOnly_RMM.png diff --git a/docs/_static/convection_allowing_models-EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.png b/docs/_static/short_range-EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.png similarity index 100% rename from docs/_static/convection_allowing_models-EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.png rename to docs/_static/short_range-EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.png diff --git a/docs/_static/convection_allowing_models-EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.png b/docs/_static/short_range-EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.png similarity index 100% rename from docs/_static/convection_allowing_models-EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.png rename to docs/_static/short_range-EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.png diff --git a/docs/_static/convection_allowing_models-GridStat_fcstFV3_obsGOES_BrightnessTempDmap.png b/docs/_static/short_range-GridStat_fcstFV3_obsGOES_BrightnessTempDmap.png similarity index 100% rename from docs/_static/convection_allowing_models-GridStat_fcstFV3_obsGOES_BrightnessTempDmap.png rename to docs/_static/short_range-GridStat_fcstFV3_obsGOES_BrightnessTempDmap.png diff --git a/docs/_static/convection_allowing_models-METdbLoad_fcstFV3_obsGoes_BrightnessTemp.png b/docs/_static/short_range-METdbLoad_fcstFV3_obsGoes_BrightnessTemp.png similarity index 100% rename from docs/_static/convection_allowing_models-METdbLoad_fcstFV3_obsGoes_BrightnessTemp.png rename to docs/_static/short_range-METdbLoad_fcstFV3_obsGoes_BrightnessTemp.png diff --git a/docs/_static/convection_allowing_models-MODE_fcstFV3_obsGOES_BrightnessTemp.png b/docs/_static/short_range-MODE_fcstFV3_obsGOES_BrightnessTemp.png similarity index 100% rename from docs/_static/convection_allowing_models-MODE_fcstFV3_obsGOES_BrightnessTemp.png rename to docs/_static/short_range-MODE_fcstFV3_obsGOES_BrightnessTemp.png diff --git a/docs/_static/convection_allowing_models-MODE_fcstFV3_obsGOES_BrightnessTempObjs.png b/docs/_static/short_range-MODE_fcstFV3_obsGOES_BrightnessTempObjs.png similarity index 100% rename from docs/_static/convection_allowing_models-MODE_fcstFV3_obsGOES_BrightnessTempObjs.png rename to docs/_static/short_range-MODE_fcstFV3_obsGOES_BrightnessTempObjs.png diff --git a/docs/_static/convection_allowing_models-MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.png b/docs/_static/short_range-MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.png similarity index 100% rename from docs/_static/convection_allowing_models-MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.png rename to docs/_static/short_range-MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.png diff --git a/docs/_static/convection_allowing_models-MTD_fcstHREF_FcstOnly_Gempak.png b/docs/_static/short_range-MTD_fcstHREF_FcstOnly_Gempak.png similarity index 100% rename from docs/_static/convection_allowing_models-MTD_fcstHREF_FcstOnly_Gempak.png rename to docs/_static/short_range-MTD_fcstHREF_FcstOnly_Gempak.png diff --git a/docs/_static/convection_allowing_models-Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.png b/docs/_static/short_range-Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.png similarity index 100% rename from docs/_static/convection_allowing_models-Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.png rename to docs/_static/short_range-Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.png diff --git a/docs/_static/convection_allowing_models-SS_PP_prob.png b/docs/_static/short_range-SS_PP_prob.png similarity index 100% rename from docs/_static/convection_allowing_models-SS_PP_prob.png rename to 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 deleted file mode 100644 index cde07319df..0000000000 --- a/docs/use_cases/model_applications/convection_allowing_models/README.rst +++ /dev/null @@ -1,3 +0,0 @@ -Convection Allowing Models --------------------------- -High resolution model configurations (1-4km) usually producing forecasts between 0-3 days (also referred to as limited area models, stand-alone regional, and short range weather applications) diff --git a/docs/use_cases/model_applications/s2s_mid_lat/README.rst b/docs/use_cases/model_applications/s2s_mid_lat/README.rst new file mode 100644 index 0000000000..237d4e1f88 --- /dev/null +++ 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 diff --git a/docs/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking.py b/docs/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking.py similarity index 92% rename from docs/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking.py rename to docs/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking.py index 0c14caa9da..bfe001699e 100644 --- a/docs/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking.py +++ b/docs/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking.py @@ -3,7 +3,7 @@ ======================================================================================== model_applications/ -s2s/ +s2s_mid_lat/ UserScript_fcstGFS_obsERA_Blocking.py """ @@ -82,13 +82,13 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# i.e. parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking.py. +# i.e. parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking.py. # The file UserScript_fcstGFS_obsERA_Blocking.conf runs the python program, and the # variables for all steps of the Blocking calculation are given in the [user_env_vars] # section of the .conf file. # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking.conf # ############################################################################## @@ -112,7 +112,7 @@ # # This use case uses Python scripts to perform the blocking calculation # -# parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/Blocking_driver.py: +# parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/Blocking_driver.py: # This script calls the requested steps in the blocking analysis for a forecast, observation, or both. The possible # steps are computing CBLs, plotting CBLs, computing IBLs, plotting IBLs, computing GIBLs, computing blocks, and # plotting blocks. @@ -127,7 +127,7 @@ # pre-processing steps. See the METcalcpy `Utility script `_ for more information. # # .. highlight:: python -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/Blocking_driver.py +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/Blocking_driver.py # ############################################################################## @@ -138,11 +138,11 @@ # # 1) Passing in UserScript_fcstGFS_obsERA_Blocking.py then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking.py -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking.py -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in UserScript_fcstGFS_obsERA_Blocking.py:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking.py +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking.py # # The following variables must be set correctly: # @@ -163,7 +163,7 @@ # --------------- # # Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use -# case will be found in model_applications/s2s/Blocking (relative to **OUTPUT_BASE**) and will contain output +# case will be found in model_applications/s2s_mid_lat/Blocking (relative to **OUTPUT_BASE**) and will contain output # for the steps requested. This may include the regridded data, daily averaged files, running mean files, # and anomaly files. In addition, output CBL, IBL, and Blocking frequency plots can be generated. The location # of these output plots can be specified as BLOCKING_PLOT_OUTPUT_DIR. If it is not specified, plots will be sent @@ -184,6 +184,7 @@ # * PCPCombineUseCase # * StatAnalysisUseCase # * S2SAppUseCase +# * S2SMidLatAppUseCase # * NetCDFFileUseCase # * GRIB2FileUseCase # @@ -191,4 +192,4 @@ # # # -# sphinx_gallery_thumbnail_path = '_static/s2s-IBL_frequency.png' +# sphinx_gallery_thumbnail_path = '_static/s2s_mid_lat-UserScript_fcstGFS_obsERA_Blocking.png' diff --git a/docs/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.py b/docs/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime.py similarity index 92% rename from docs/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.py rename to docs/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime.py index ac4abf5549..90a3adea2d 100644 --- a/docs/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.py +++ b/docs/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime.py @@ -3,7 +3,7 @@ ================================================================================================== model_applications/ -s2s/ +s2s_mid_lat/ UserScript_fcstGFS_obsERA_WeatherRegime.py """ @@ -93,12 +93,12 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# i.e. parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.py. +# i.e. parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime.py. # The file UserScript_fcstGFS_obsERA_WeatherRegime.conf runs the python program and # sets the variables for all steps of the Weather Regime use case including data paths. # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime.conf # ############################################################################## @@ -121,7 +121,7 @@ # # This use case uses Python scripts to perform the blocking calculation # -# parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py: +# parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py: # This script calls the requested steps in the blocking analysis for a forecast, observation, or both. The possible # steps are computing the elbow, computing EOFs, and computing weather regimes using k means clustering. # @@ -135,7 +135,7 @@ # pre-processing steps. See the METcalcpy `Utility script `_ for more information. # # .. highlight:: python -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py # ############################################################################## @@ -146,11 +146,11 @@ # # 1) Passing in UserScript_fcstGFS_obsERA_WeatherRegime.py then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.py -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime.py -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in UserScript_fcstGFS_obsERA_WeatherRegime.py:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.py +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime.py # # The following variables must be set correctly: # @@ -171,7 +171,7 @@ # --------------- # # Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use -# case will be found in model_applications/s2s/WeatherRegime (relative to **OUTPUT_BASE**) and will contain output +# case will be found in model_applications/s2s_mid_lat/WeatherRegime (relative to **OUTPUT_BASE**) and will contain output # for the steps requested. This may include the regridded data, daily averaged files, a text file containing the # list of input files, and text files for the weather regime classification and time frequency (if KMEANS and # TIMEFREQ are run for both the forecast and observation data). In addition, output elbow, EOF, and Kmeans weather @@ -193,6 +193,7 @@ # * PCPCombineUseCase # * StatAnalysisUseCase # * S2SAppUseCase +# * S2SMidLatAppUseCase # * NetCDFFileUseCase # * GRIB2FileUseCase # @@ -200,4 +201,4 @@ # # # -# sphinx_gallery_thumbnail_path = '_static/s2s-OBS_ERA_weather_regime.png' +# sphinx_gallery_thumbnail_path = '_static/s2s_mid_lat-UserScript_fcstGFS_obsERA_WeatherRegime.png' diff --git a/docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking.py b/docs/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking.py similarity index 92% rename from docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking.py rename to docs/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking.py index 065a96570c..44987edbc1 100644 --- a/docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking.py +++ b/docs/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking.py @@ -3,7 +3,7 @@ ================================================================================ model_applications/ -s2s/ +s2s_mid_lat/ UserScript_obsERA_obsOnly_Blocking.py """ @@ -83,13 +83,13 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# i.e. parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking.py. +# i.e. parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking.py. # The file UserScript_obsERA_obsOnly_Blocking.conf runs the python program, and the # variables for all steps of the Blocking use case are set in the [user_env_vars] # section. # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking.conf # ############################################################################## @@ -111,7 +111,7 @@ # # This use case uses Python scripts to perform the blocking calculation # -# parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking/Blocking_driver.py: +# parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking/Blocking_driver.py: # This script calls the requested steps in the blocking analysis for a forecast, observation, or both. # # metcalcpy/contributed/blocking_weather_regime/Blocking.py: @@ -124,7 +124,7 @@ # pre-processing steps. See the METcalcpy `Utility script `_ for more information. # # .. highlight:: python -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking/Blocking_driver.py +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking/Blocking_driver.py # ############################################################################## @@ -135,11 +135,11 @@ # # 1) Passing in UserScript_obsERA_obsOnly_Blocking.py then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking.py -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking.py -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in UserScript_obsERA_obsOnly_Blocking.py:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking.py +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking.py # # The following variables must be set correctly: # @@ -160,7 +160,7 @@ # --------------- # # Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use -# case will be found in model_applications/s2s/Blocking (relative to **OUTPUT_BASE**) and will contain output +# case will be found in model_applications/s2s_mid_lat/Blocking (relative to **OUTPUT_BASE**) and will contain output # for the steps requested. This may include the regridded data, daily averaged files, running mean files, # and anomaly files. In addition, output CBL, IBL, and Blocking frequency plots can be generated. The location # of these output plots can be specified as BLOCKING_PLOT_OUTPUT_DIR. If it is not specified, plots will be sent @@ -178,6 +178,7 @@ # * RegridDataPlaneUseCase # * PCPCombineUseCase # * S2SAppUseCase +# * S2SMidLatAppUseCase # * NetCDFFileUseCase # * GRIB2FileUseCase # @@ -185,5 +186,5 @@ # # # -# sphinx_gallery_thumbnail_path = '_static/s2s-OBS_ERA_blocking_frequency.png' +# sphinx_gallery_thumbnail_path = '_static/s2s_mid_lat-UserScript_obsERA_obsOnly_Blocking.png' # diff --git a/docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime.py b/docs/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime.py similarity index 92% rename from docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime.py rename to docs/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime.py index 3cb9520456..91d88bc7b1 100644 --- a/docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime.py +++ b/docs/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime.py @@ -3,7 +3,7 @@ ========================================================================================== model_applications/ -s2s/ +s2s_mid_lat/ UserScript_obsERA_obsOnly_WeatherRegime.py """ @@ -92,12 +92,12 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# i.e. parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime.py. +# i.e. parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime.py. # The file UserScript_obsERA_obsOnly_WeatherRegime.conf runs the python program and # sets the variables for all steps of the Weather Regime use case including data paths. # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime.conf # ############################################################################## @@ -120,7 +120,7 @@ # # This use case uses Python scripts to perform the blocking calculation # -# parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime/WeatherRegime_driver.py: +# parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime/WeatherRegime_driver.py: # This script calls the requested steps in the blocking analysis for a forecast, observation, or both. The possible # steps are computing the elbow, computing EOFs, and computing weather regimes using k means clustering. # @@ -134,7 +134,7 @@ # pre-processing steps. See the METcalcpy `Utility script `_ for more information. # # .. highlight:: python -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime/WeatherRegime_driver.py +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime/WeatherRegime_driver.py # ############################################################################## @@ -145,11 +145,11 @@ # # 1) Passing in UserScript_obsERA_obsOnly_WeatherRegime.py then a user-specific system configuration file:: # -# master_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime.py -c /path/to/user_system.conf +# master_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime.py -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in UserScript_obsERA_obsOnly_WeatherRegime.py:: # -# master_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime.py +# master_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime.py # # The following variables must be set correctly: # @@ -170,7 +170,7 @@ # --------------- # # Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use -# case will be found in model_applications/s2s/WeatherRegime (relative to **OUTPUT_BASE**) and will contain output +# case will be found in model_applications/s2s_mid_lat/WeatherRegime (relative to **OUTPUT_BASE**) and will contain output # for the steps requested. This may include the regridded data, daily averaged files, a text file containing the # list of input files, and text files for the weather regime classification and time frequency (if KMEANS and # TIMEFREQ are run for both the forecast and observation data). In addition, output elbow, EOF, and Kmeans weather @@ -192,6 +192,7 @@ # * PCPCombineUseCase # * StatAnalysisUseCase # * S2SAppUseCase +# * S2SMidLatAppUseCase # * NetCDFFileUseCase # * GRIB2FileUseCase # @@ -199,4 +200,4 @@ # # # -# sphinx_gallery_thumbnail_path = '_static/s2s-OBS_ERA_weather_regime_freq.png' +# sphinx_gallery_thumbnail_path = '_static/s2s_mid_lat-UserScript_obsERA_obsOnly_WeatherRegime.png' diff --git a/docs/use_cases/model_applications/s2s_mjo/README.rst b/docs/use_cases/model_applications/s2s_mjo/README.rst new file mode 100644 index 0000000000..63a14664f3 --- /dev/null +++ b/docs/use_cases/model_applications/s2s_mjo/README.rst @@ -0,0 +1,3 @@ +Subseasonal to Seasonal: Madden-Julian Oscillation +-------------------------------------------------- +Subseasonal-to-Seasonal model configurations relating to the Madden-Julian oscillation diff --git a/docs/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.py b/docs/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI.py similarity index 87% rename from docs/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.py rename to docs/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI.py index 201e41d96e..64cacbe08d 100644 --- a/docs/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.py +++ b/docs/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI.py @@ -1,9 +1,9 @@ """ UserScript: Make OMI plot from calculated MJO indices -=========================================================================== +===================================================== model_applications/ -s2s/ +s2s_mjo/ UserScript_fcstGFS_obsERA_OMI.py """ @@ -63,12 +63,12 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# i.e. parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.conf. +# i.e. parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI.conf. # The file UserScript_fcstGFS_obsERA_OMI/OMI_driver.py runs the python program and # UserScript_fcstGFS_obsERA_OMI.conf sets the variables for all steps of the OMI use case. # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI.conf ############################################################################## # MET Configuration @@ -85,10 +85,10 @@ # # The OMI driver script orchestrates the calculation of the MJO indices and # the generation of a phase diagram OMI plot: -# parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/OMI_driver.py: +# parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/OMI_driver.py: # # .. highlight:: python -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/OMI_driver.py +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/OMI_driver.py # ############################################################################## @@ -99,11 +99,11 @@ # # 1) Passing in UserScript_fcstGFS_obsERA_OMI.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in UserScript_fcstGFS_obsERA_OMI.py:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI.conf # # The following variables must be set correctly: # @@ -123,7 +123,7 @@ # Expected Output # --------------- # -# Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use case will be found in model_applications/s2s/UserScript_fcstGFS_obsERA_OMI. This may include the regridded data and daily averaged files. In addition, the phase diagram plots will be generated and the output location can be specified as OMI_PLOT_OUTPUT_DIR. If it is not specified, plots will be sent to model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/plots (relative to **OUTPUT_BASE**). +# Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use case will be found in model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI. This may include the regridded data and daily averaged files. In addition, the phase diagram plots will be generated and the output location can be specified as OMI_PLOT_OUTPUT_DIR. If it is not specified, plots will be sent to model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/plots (relative to **OUTPUT_BASE**). ############################################################################## # Keywords @@ -132,10 +132,11 @@ # .. note:: # # * S2SAppUseCase +# * S2SMJOAppUseCase # * RegridDataPlaneUseCase # * PCPCombineUseCase # # Navigate to :ref:`quick-search` to discover other similar use cases. # -# sphinx_gallery_thumbnail_path = '_static/s2s-OMI_GFS_phase_diagram.png' +# sphinx_gallery_thumbnail_path = '_static/s2s_mjo-UserScript_fcstGFS_obsERA_OMI.png' # diff --git a/docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI.py b/docs/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI.py similarity index 86% rename from docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI.py rename to docs/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI.py index 90450b8134..2c95d3031b 100644 --- a/docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI.py +++ b/docs/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI.py @@ -1,9 +1,9 @@ """ UserScript: Make OMI plot from calculated MJO indices -=========================================================================== +===================================================== model_applications/ -s2s/ +s2s_mjo/ UserScript_obsERA_obsOnly_OMI.py """ @@ -63,12 +63,12 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# i.e. parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI.conf. +# i.e. parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI.conf. # The file UserScript_obsERA_obsOnly_OMI/OMI_driver.py runs the python program and # UserScript_fcstGFS_obsERA_OMI.conf sets the variables for all steps of the OMI use case. # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI.conf ############################################################################## # MET Configuration @@ -85,10 +85,10 @@ # # The OMI driver script orchestrates the calculation of the MJO indices and # the generation of a phase diagram OMI plot: -# parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI/OMI_driver.py: +# parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI/OMI_driver.py: # # .. highlight:: python -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI/OMI_driver.py +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI/OMI_driver.py # ############################################################################## @@ -99,11 +99,11 @@ # # 1) Passing in UserScript_obsERA_obsOnly_OMI.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in UserScript_obsERA_obsOnly_OMI.py:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI.conf # # The following variables must be set correctly: # @@ -123,7 +123,7 @@ # Expected Output # --------------- # -# Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use case will be found in model_applications/s2s/UserScript_obsERA_obsOnly_OMI. This may include the regridded data and daily averaged files. In addition, the phase diagram plots will be generated and the output location can be specified as OMI_PLOT_OUTPUT_DIR. If it is not specified, plots will be sent to model_applications/s2s/UserScript_obsERA_obsOnly_OMI/plots (relative to **OUTPUT_BASE**). +# Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use case will be found in model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI. This may include the regridded data and daily averaged files. In addition, the phase diagram plots will be generated and the output location can be specified as OMI_PLOT_OUTPUT_DIR. If it is not specified, plots will be sent to model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI/plots (relative to **OUTPUT_BASE**). ############################################################################## # Keywords @@ -132,10 +132,11 @@ # .. note:: # # * S2SAppUseCase +# * S2SMJOAppUseCase # * RegridDataPlaneUseCase # * PCPCombineUseCase # # Navigate to :ref:`quick-search` to discover other similar use cases. # -# sphinx_gallery_thumbnail_path = '_static/s2s-OMI_phase_diagram.png' -# \ No newline at end of file +# sphinx_gallery_thumbnail_path = '_static/s2s_mjo-UserScript_obsERA_obsOnly_OMI.png' +# diff --git a/docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.py b/docs/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram.py similarity index 83% rename from docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.py rename to docs/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram.py index 3266d628dd..7d27c127d0 100644 --- a/docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.py +++ b/docs/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram.py @@ -1,9 +1,9 @@ """ UserScript: Make a Phase Diagram plot from input RMM or OMI -=========================================================================== +=========================================================== model_applications/ -s2s/ +s2s_mjo/ UserScript_obsERA_obsOnly_PhaseDiagram.py """ @@ -63,13 +63,13 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# i.e. parm/use_cases/model_applications/s2s/UserScript_obsERA_obsERA_OMI.conf. +# i.e. parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsERA_OMI.conf. # The file UserScript_obsERA_obsOnly_PhaseDiagram/PhaseDiagram_driver.py runs the python # program and UserScript_obsERA_obsOnly_PhaseDiagram.conf sets the variables for all steps # of the use case. # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram.conf ############################################################################## # MET Configuration @@ -84,11 +84,11 @@ # ---------------- # # The phase diagram driver script orchestrates the generation of a phase diagram plot: -# parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI/PhaseDiagram_driver.py: +# parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI/PhaseDiagram_driver.py: # # .. highlight:: python -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/PhaseDiagram_driver.py -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/save_input_files_txt.py +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram/PhaseDiagram_driver.py +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram/save_input_files_txt.py # ############################################################################## @@ -99,11 +99,11 @@ # # 1) Passing in UserScript_obsERA_obsOnly_PhaseDiagram.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in UserScript_obsERA_obsOnly_PhaseDiagram.py:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram.conf # # The following variables must be set correctly: # @@ -123,7 +123,7 @@ # Expected Output # --------------- # -# Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use case will be found in model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram. This may include the regridded data and daily averaged files. In addition, the phase diagram plots will be generated and the output location can be specified as PHASE_DIAGRAM_PLOT_OUTPUT_DIR. If it is not specified, plots will be sent to model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/plots (relative to **OUTPUT_BASE**). +# Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use case will be found in model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram. This may include the regridded data and daily averaged files. In addition, the phase diagram plots will be generated and the output location can be specified as PHASE_DIAGRAM_PLOT_OUTPUT_DIR. If it is not specified, plots will be sent to model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram/plots (relative to **OUTPUT_BASE**). ############################################################################## # Keywords @@ -133,8 +133,9 @@ # .. note:: # # * S2SAppUseCase +# * S2SMJOAppUseCase # # Navigate to :ref:`quick-search` to discover other similar use cases. # -# sphinx_gallery_thumbnail_path = '_static/s2s-PhaseDiagram.png' -# \ No newline at end of file +# sphinx_gallery_thumbnail_path = '_static/s2s_mjo-UserScript_obsERA_obsOnly_PhaseDiagram.png' +# diff --git a/docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM.py b/docs/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM.py similarity index 85% rename from docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM.py rename to docs/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM.py index 6c4f3e5c6c..15e2b7446f 100644 --- a/docs/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM.py +++ b/docs/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM.py @@ -1,9 +1,9 @@ """ UserScript: Make RMM plots from calculated MJO indices -=========================================================================== +====================================================== model_applications/ -s2s/ +s2s_mjo/ UserScript_obsERA_obsOnly_RMM.py """ @@ -63,12 +63,12 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# i.e. parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM.conf. +# i.e. parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM.conf. # The file UserScript_obsERA_obsOnly_RMM/RMM_driver.py runs the python program and # UserScript_obsERA_obsOnly_RMM.conf sets the variables for all steps of the RMM use case. # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM.conf ############################################################################## # MET Configuration @@ -85,13 +85,13 @@ # # The RMM driver script orchestrates the calculation of the MJO indices and # the generation of three RMM plots: -# parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/RMM_driver.py: +# parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/RMM_driver.py: # The harmonic anomalies script creates anomalies of input data using a harmonic analysis: -# parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py +# parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py # # .. highlight:: python -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/RMM_driver.py -# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/RMM_driver.py +# .. literalinclude:: ../../../../parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py # ############################################################################## @@ -102,11 +102,11 @@ # # 1) Passing in UserScript_obsERA_obsOnly_RMM.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in UserScript_obsERA_obsOnly_RMM.py:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM.conf # # The following variables must be set correctly: # @@ -126,7 +126,7 @@ # Expected Output # --------------- # -# Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use case will be found in model_applications/s2s/UserScript_obsERA_obsOnly_RMM. This may include the regridded data and daily averaged files. In addition, three plots will be generated, a phase diagram, time series, and EOF plot, and the output location can be specified as RMM_PLOT_OUTPUT_DIR. If it is not specified, plots will be sent to model_applications/s2s/UserScript_obsERA_obsOnly_RMM/plots (relative to **OUTPUT_BASE**). +# Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. Output for this use case will be found in model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM. This may include the regridded data and daily averaged files. In addition, three plots will be generated, a phase diagram, time series, and EOF plot, and the output location can be specified as RMM_PLOT_OUTPUT_DIR. If it is not specified, plots will be sent to model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/plots (relative to **OUTPUT_BASE**). # ############################################################################## @@ -137,11 +137,12 @@ # .. note:: # # * S2SAppUseCase +# * S2SMJOAppUseCase # * NetCDFFileUseCase # * RegridDataPlaneUseCase # * PCPCombineUseCase # # Navigate to :ref:`quick-search` to discover other similar use cases. # -# sphinx_gallery_thumbnail_path = '_static/s2s-RMM_time_series.png' -# \ No newline at end of file +# sphinx_gallery_thumbnail_path = '_static/s2s_mjo-UserScript_obsERA_obsOnly_RMM.png' +# diff --git a/docs/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.py b/docs/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.py similarity index 90% rename from docs/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.py rename to docs/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.py index 78cc9bd9d3..9b175c0e06 100644 --- a/docs/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.py +++ b/docs/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.py @@ -3,7 +3,7 @@ ======================================================== model_applications/ -convection_allowing_models/ +short_range/ EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf """ @@ -64,10 +64,10 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# with the -c option, i.e. -c parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf +# with the -c option, i.e. -c parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf ############################################################################## # MET Configuration @@ -94,11 +94,11 @@ # # 1) Passing in EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf # # The former method is recommended. Whether you add them to a user-specific configuration file or modify the metplus_config files, the following variables must be set correctly: # @@ -125,7 +125,7 @@ # INFO: METplus has successfully finished running. # # Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. -# Output for this use case will be found in model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField/EnsembleStat/201807091200 (relative to **OUTPUT_BASE**) +# Output for this use case will be found in model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField/EnsembleStat/201807091200 (relative to **OUTPUT_BASE**) # and will contain the following files: # # * ensemble_stat_HRRRE_F000_ADPSFC_20180709_120000V_ecnt.txt @@ -162,7 +162,7 @@ # .. note:: # # * EnsembleStatToolUseCase -# * ConvectionAllowingModelsAppUseCase +# * ShortRangeAppUseCase # * PB2NCToolUseCase # * prepBUFRFileUseCase # * GRIB2FileUseCase @@ -178,4 +178,4 @@ # # # -# sphinx_gallery_thumbnail_path = '_static/convection_allowing_models-EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.png' +# sphinx_gallery_thumbnail_path = '_static/short_range-EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.png' diff --git a/docs/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.py b/docs/use_cases/model_applications/short_range/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.py similarity index 93% rename from docs/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.py rename to docs/use_cases/model_applications/short_range/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.py index f697a3101c..2eb3b906d6 100644 --- a/docs/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.py +++ b/docs/use_cases/model_applications/short_range/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.py @@ -2,10 +2,10 @@ Surrogate Severe Calculation: PCPCombine, EnsembleStat, and RegridDataPlane =================================================================================================== -model_applications/\ -convection_allowing_model/\ -EnsembleStat_fcstHRRR_fcstOnly_\ -SurrogateSevere.conf +model_applications/ +short_range/ +EnsembleStat_fcstHRRR_fcstOnly +_SurrogateSevere.conf """ ################################################################################################### @@ -62,7 +62,7 @@ # any configuration files passed to METplus by the command line with the -c option. # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf ################################################################################################### # MET Configuration @@ -87,7 +87,7 @@ # # The command to run this use case is:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf ################################################################################################### # Expected Output @@ -128,5 +128,5 @@ # # # -# sphinx_gallery_thumbnail_path = '_static/convection_allowing_models-EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.png' +# sphinx_gallery_thumbnail_path = '_static/short_range-EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.png' # diff --git a/docs/use_cases/model_applications/convection_allowing_models/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.py b/docs/use_cases/model_applications/short_range/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.py similarity index 89% rename from docs/use_cases/model_applications/convection_allowing_models/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.py rename to docs/use_cases/model_applications/short_range/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.py index 21f3115304..27c9d36225 100644 --- a/docs/use_cases/model_applications/convection_allowing_models/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.py +++ b/docs/use_cases/model_applications/short_range/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.py @@ -3,7 +3,7 @@ ========================================================================= model_applications/ -convection_allowing_model/ +short_range/ GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf """ @@ -50,10 +50,10 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# with the -c option, i.e. -c parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf +# with the -c option, i.e. -c parm/use_cases/model_applications/short_range/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/short_range/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf ############################################################################## # MET Configuration @@ -80,11 +80,11 @@ # # 1) Passing in GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf # # The former method is recommended. Whether you add them to a user-specific configuration file or modify the metplus_config files, the following variables must be set correctly: # @@ -111,7 +111,7 @@ # INFO: METplus has successfully finished running. # # Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. -# Output for this use case will be found in convection_allowing_models/brightness_temperature +# Output for this use case will be found in short_range/brightness_temperature # (relative to **OUTPUT_BASE**) and will contain the following files: # # grid_stat/grid_stat_FV3_core_lsm1_000000L_20190521_010000V_dmap.txt @@ -135,7 +135,7 @@ # .. note:: # # * GridStatToolUseCase -# * ConvectionAllowingModelsAppUseCase +# * ShortRangeAppUseCase # * NetCDFFileUseCase # * NOAAEMCOrgUseCase # * NOAAHWTOrgUseCase @@ -145,5 +145,5 @@ # # # -# sphinx_gallery_thumbnail_path = '_static/convection_allowing_models-GridStat_fcstFV3_obsGOES_BrightnessTempDmap.png' +# sphinx_gallery_thumbnail_path = '_static/short_range-GridStat_fcstFV3_obsGOES_BrightnessTempDmap.png' # diff --git a/docs/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.py b/docs/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.py similarity index 87% rename from docs/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.py rename to docs/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.py index 56c4c7c51a..7774241dd6 100644 --- a/docs/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.py +++ b/docs/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.py @@ -3,7 +3,7 @@ ============================================================== model_applications/ -convection_allowing_model/ +short_range/ GridStat_fcstHRRR_obsPracPerfect _SurrogateSevere.conf @@ -48,10 +48,10 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# with the -c option, i.e. -c parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf +# with the -c option, i.e. -c parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf ############################################################################## # MET Configuration @@ -78,11 +78,11 @@ # # 1) Passing in GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf # # The former method is recommended. Whether you add them to a user-specific configuration file or modify the metplus_config files, the following variables must be set correctly: # @@ -108,7 +108,7 @@ # INFO: METplus has successfully finished running. # # Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. -# Output for this use case will be found in model_applications/convection_allowing_models/surrogate_severe_prac_perfect/grid_stat (relative to **OUTPUT_BASE**) +# Output for this use case will be found in model_applications/short_range/surrogate_severe_prac_perfect/grid_stat (relative to **OUTPUT_BASE**) # and will contain the following files: # # grid_stat_360000L_20200206_120000V_ctc.txt @@ -124,7 +124,7 @@ # .. note:: # # * GridStatToolUseCase -# * ConvectionAllowingModelsAppUseCase +# * ShortRangeAppUseCase # * NetCDFFileUseCase # * NOAAHWTOrgUseCase # * NCAROrgUseCase @@ -133,4 +133,4 @@ # Navigate to the :ref:`quick-search` page to discover other similar use cases. # # -# sphinx_gallery_thumbnail_path = '_static/convection_allowing_models-SS_PP_prob.png' +# sphinx_gallery_thumbnail_path = '_static/short_range-SS_PP_prob.png' diff --git a/docs/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.py b/docs/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.py similarity index 87% rename from docs/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.py rename to docs/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.py index 71d4e76afa..7a2a3546d4 100644 --- a/docs/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.py +++ b/docs/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.py @@ -3,7 +3,7 @@ ============================================================================ model_applications/ -convection_allowing_models/ +short_range/ GridStat_fcstHRRR_obsPracPerfect _SurrogateSevereProb.conf @@ -50,10 +50,10 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# with the -c option, i.e. -c parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf +# with the -c option, i.e. -c parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf ############################################################################## # MET Configuration @@ -80,11 +80,11 @@ # # 1) Passing in GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf # # The former method is recommended. Whether you add them to a user-specific configuration file or modify the metplus_config files, the following variables must be set correctly: # @@ -110,7 +110,7 @@ # INFO: METplus has successfully finished running. # # Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. -# Output for this use case will be found in model_applications/convection_allowing_models/surrogate_severe_prac_perfect/grid_stat/prob (relative to **OUTPUT_BASE**) +# Output for this use case will be found in model_applications/short_range/surrogate_severe_prac_perfect/grid_stat/prob (relative to **OUTPUT_BASE**) # and will contain the following files: # # grid_stat_360000L_20200206_120000V_pct.txt @@ -127,7 +127,7 @@ # .. note:: # # * GridStatToolUseCase -# * ConvectionAllowingModelsAppUseCase +# * ShortRangeAppUseCase # * NetCDFFileUseCase # * NOAAHWTOrgUseCase # * NCAROrgUseCase @@ -137,5 +137,5 @@ # # # -# sphinx_gallery_thumbnail_path = '_static/convection_allowing_models-SS_PP_prob.png' +# sphinx_gallery_thumbnail_path = '_static/short_range-SS_PP_prob.png' # diff --git a/docs/use_cases/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.py b/docs/use_cases/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.py similarity index 91% rename from docs/use_cases/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.py rename to docs/use_cases/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.py index cb845d0a81..22571027ab 100644 --- a/docs/use_cases/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.py +++ b/docs/use_cases/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.py @@ -3,7 +3,7 @@ ================================= model_applications/ -convection_allowing_model/ +short_range/ METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf """ @@ -59,7 +59,7 @@ # then it loads any configuration files passed to METplus via the command line # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf ############################################################################## # XML Configuration @@ -86,11 +86,11 @@ # # 1) Passing in METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf followed by a user-specific system configuration file:: # -# run_metplus.py /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf /path/to/user_system.conf +# run_metplus.py /path/to/METplus/parm/use_cases/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config and then passing in METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf:: # -# run_metplus.py /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf +# run_metplus.py /path/to/METplus/parm/use_cases/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf # # The former method is recommended. Whether you add them to a user-specific configuration file or modify the metplus_config files, the following variables must be set correctly: # @@ -128,7 +128,7 @@ # .. note:: # # * METdbLoadUseCase -# * ConvectionAllowingModelsAppUseCase +# * ShortRangeAppUseCase # * NOAAEMCOrgUseCase # * NOAAHWTOrgUseCase # @@ -136,5 +136,5 @@ # # # -# sphinx_gallery_thumbnail_path = '_static/convection_allowing_models-METdbLoad_fcstFV3_obsGoes_BrightnessTemp.png' +# sphinx_gallery_thumbnail_path = '_static/short_range-METdbLoad_fcstFV3_obsGoes_BrightnessTemp.png' # diff --git a/docs/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp.py b/docs/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp.py similarity index 90% rename from docs/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp.py rename to docs/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp.py index aa3f143ec7..712d14ab4e 100644 --- a/docs/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp.py +++ b/docs/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp.py @@ -3,7 +3,7 @@ ========================================================================= model_applications/ -convection_allowing_model/ +short_range/ MODE_fcstFV3_obsGOES_BrightnessTemp.conf """ @@ -50,10 +50,10 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# with the -c option, i.e. -c parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp.conf +# with the -c option, i.e. -c parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp.conf # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp.conf ############################################################################## # MET Configuration @@ -80,11 +80,11 @@ # # 1) Passing in MODE_fcstFV3_obsGOES_BrightnessTemp.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in MODE_fcstFV3_obsGOES_BrightnessTemp.conf:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp.conf # # The former method is recommended. Whether you add them to a user-specific configuration file or modify the metplus_config files, the following variables must be set correctly: # @@ -111,7 +111,7 @@ # INFO: METplus has successfully finished running. # # Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. -# Output for this use case will be found in convection_allowing_models/brightness_temperature +# Output for this use case will be found in short_range/brightness_temperature # (relative to **OUTPUT_BASE**) and will contain the following files: # # mode_FV3_core_lsm1_010000L_20190521_010000V_NAA_cts.txt @@ -141,7 +141,7 @@ # # * MODEToolUseCase # * MODEToolUseCase -# * ConvectionAllowingModelsAppUseCase +# * ShortRangeAppUseCase # * NetCDFFileUseCase # * NOAAEMCOrgUseCase # * NOAAHWTOrgUseCase @@ -151,5 +151,5 @@ # # # -# sphinx_gallery_thumbnail_path = '_static/convection_allowing_models-MODE_fcstFV3_obsGOES_BrightnessTemp.png' +# sphinx_gallery_thumbnail_path = '_static/short_range-MODE_fcstFV3_obsGOES_BrightnessTemp.png' # diff --git a/docs/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTempObjs.py b/docs/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTempObjs.py similarity index 92% rename from docs/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTempObjs.py rename to docs/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTempObjs.py index f08803fae7..3fbf634497 100644 --- a/docs/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTempObjs.py +++ b/docs/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTempObjs.py @@ -3,7 +3,7 @@ ========================================================================= model_applications/ -convection_allowing_model/ +short_range/ MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf """ @@ -52,10 +52,10 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# with the -c option, i.e. -c parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf +# with the -c option, i.e. -c parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf ############################################################################## # MET Configuration @@ -87,11 +87,11 @@ # # 1) Passing in MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf # # The former method is recommended. Whether you add them to a user-specific configuration file or modify the metplus_config files, the following variables must be set correctly: # @@ -118,7 +118,7 @@ # INFO: METplus has successfully finished running. # # Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. -# Output for this use case will be found in convection_allowing_models/brightness_temperature +# Output for this use case will be found in short_range/brightness_temperature # (relative to **OUTPUT_BASE**) and will contain the following files: # # mode/mode_FV3_core_lsm1_010000L_20190521_010000V_NAA_cts.txt @@ -163,7 +163,7 @@ # # * MODEToolUseCase # * GridStatToolUseCase -# * ConvectionAllowingModelsAppUseCase +# * ShortRangeAppUseCase # * NetCDFFileUseCase # * NOAAEMCOrgUseCase # * NOAAHWTOrgUseCase @@ -173,5 +173,5 @@ # # # -# sphinx_gallery_thumbnail_path = '_static/convection_allowing_models-MODE_fcstFV3_obsGOES_BrightnessTempObjs.png' +# sphinx_gallery_thumbnail_path = '_static/short_range-MODE_fcstFV3_obsGOES_BrightnessTempObjs.png' # diff --git a/docs/use_cases/model_applications/convection_allowing_models/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.py b/docs/use_cases/model_applications/short_range/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.py similarity index 91% rename from docs/use_cases/model_applications/convection_allowing_models/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.py rename to docs/use_cases/model_applications/short_range/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.py index 3828d5c7e3..374e84056a 100644 --- a/docs/use_cases/model_applications/convection_allowing_models/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.py +++ b/docs/use_cases/model_applications/short_range/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.py @@ -3,7 +3,7 @@ ========================================================================= model_applications/ -convection_allowing_model/ +short_range/ MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf """ @@ -55,10 +55,10 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# with the -c option, i.e. -c parm/use_cases/model_applications/convection_allowing_models/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf +# with the -c option, i.e. -c parm/use_cases/model_applications/short_range/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/convection_allowing_models/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/short_range/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf ############################################################################## # MET Configuration @@ -85,11 +85,11 @@ # # 1) Passing in MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.conf:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.conf # # The former method is recommended. Whether you add them to a user-specific configuration file or modify the metplus_config files, the following variables must be set correctly: # @@ -137,7 +137,7 @@ # .. note:: # # * MODEToolUseCase -# * ConvectionAllowingModelsAppUseCase +# * ShortRangeAppUseCase # * GRIB2FileUseCase # * RegriddingInToolUseCase # * NOAAHWTOrgUseCase @@ -148,5 +148,5 @@ # Navigate to the :ref:`quick-search` page to discover other similar use cases. # # -# sphinx_gallery_thumbnail_path = '_static/convection_allowing_models-MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.png' +# sphinx_gallery_thumbnail_path = '_static/short_range-MODE_fcstHRRRE_obsMRMS_Hail_GRIB2.png' # diff --git a/docs/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.py b/docs/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.py similarity index 85% rename from docs/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.py rename to docs/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.py index cb1c964e5b..6ee80ca011 100644 --- a/docs/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.py +++ b/docs/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.py @@ -3,7 +3,7 @@ ============================================================ model_applications/ -convection_allowing_models/ +short_range/ Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf """ @@ -56,10 +56,10 @@ # # METplus first loads all of the configuration files found in parm/metplus_config, # then it loads any configuration files passed to METplus via the command line -# with the -c option, i.e. -c parm/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf +# with the -c option, i.e. -c parm/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf # # .. highlight:: bash -# .. literalinclude:: ../../../../parm/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf +# .. literalinclude:: ../../../../parm/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf # ############################################################################## @@ -84,10 +84,10 @@ # # This use case uses a Python embedding script to read input data # -# parm/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect/read_ascii_storm.py +# parm/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect/read_ascii_storm.py # # .. highlight:: python -# .. literalinclude:: ../../../../parm/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect/read_ascii_storm.py +# .. literalinclude:: ../../../../parm/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect/read_ascii_storm.py # ############################################################################## @@ -98,11 +98,11 @@ # # 1) Passing in EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf then a user-specific system configuration file:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf -c /path/to/user_system.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf -c /path/to/user_system.conf # # 2) Modifying the configurations in parm/metplus_config, then passing in EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf:: # -# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf +# run_metplus.py -c /path/to/METplus/parm/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf # # The former method is recommended. Whether you add them to a user-specific configuration file or modify the metplus_config files, the following variables must be set correctly: # @@ -129,7 +129,7 @@ # INFO: METplus has successfully finished running. # # Refer to the value set for **OUTPUT_BASE** to find where the output data was generated. -# Output for this use case will be found in model_applications/convection_allowing_models/practically_perfect/ (relative to **OUTPUT_BASE**) +# Output for this use case will be found in model_applications/short_range/practically_perfect/ (relative to **OUTPUT_BASE**) # and will contain the following files: # # * StormReps_211_Probs.20200205.nc @@ -148,7 +148,7 @@ # * RegriddingInToolUseCase # * NetCDFFileUseCase # * PythonEmbeddingFileUseCase -# * ConvectionAllowingModelsAppUseCase +# * ShortRangeAppUseCase # * NCAROrgUseCase # * ProbabilityGenerationUseCase # * MaskingFeatureUseCase @@ -158,4 +158,4 @@ # Navigate to the :ref:`quick-search` page to discover other similar use cases. # # -# sphinx_gallery_thumbnail_path = '_static/convection_allowing_models-Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.png' +# sphinx_gallery_thumbnail_path = '_static/short_range-Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.png' diff --git a/docs/use_cases/model_applications/short_range/README.rst b/docs/use_cases/model_applications/short_range/README.rst new file mode 100644 index 0000000000..2c004dcf97 --- /dev/null +++ b/docs/use_cases/model_applications/short_range/README.rst @@ -0,0 +1,3 @@ +Short Range +----------- +High resolution model configurations (1-4km) usually producing forecasts between 0-3 days (also referred to as limited area models, stand-alone regional, and short range weather applications); Previously named Convection Allowing Models diff --git a/internal_tests/use_cases/all_use_cases.txt b/internal_tests/use_cases/all_use_cases.txt index 58a5255013..e37b0466e5 100644 --- a/internal_tests/use_cases/all_use_cases.txt +++ b/internal_tests/use_cases/all_use_cases.txt @@ -52,7 +52,7 @@ Category: met_tool_wrapper 50::met_tool_wrapper/UserScript/UserScript_run_once_per_init.conf 51::met_tool_wrapper/UserScript/UserScript_run_once_per_lead.conf 52::met_tool_wrapper/UserScript/UserScript_run_once_per_valid.conf -53::METdbLoad::met_tool_wrapper/METdbLoad/METdbLoad.conf:: metdatadb_env,metviewer +53::METdbLoad::met_tool_wrapper/METdbLoad/METdbLoad.conf:: metdataio_env,metviewer 54::ExtractTiles_mtd::met_tool_wrapper/ExtractTiles/ExtractTiles_mtd.conf 55::GFDLTracker_TC::met_tool_wrapper/GFDLTracker/GFDLTracker_TC.conf::gfdl-tracker_env 56::GFDLTracker_ETC::met_tool_wrapper/GFDLTracker/GFDLTracker_ETC.conf::gfdl-tracker_env @@ -70,17 +70,17 @@ Category: climate 1::MODE_fcstCESM_obsGPCP_AsianMonsoonPrecip::model_applications/climate/MODE_fcstCESM_obsGPCP_AsianMonsoonPrecip.conf -Category: convection_allowing_models -0::EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField::model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf -1::MODE_fcstHRRR_obsMRMS_Hail_GRIB2::model_applications/convection_allowing_models/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf -2::EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere::model_applications/convection_allowing_models/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf -3::GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere::model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf -4::GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb::model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf -5::Point2Grid_obsLSR_ObsOnly_PracticallyPerfect::model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf -6::GridStat_fcstFV3_obsGOES_BrightnessTempDmap:: model_applications/convection_allowing_models/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf -7::MODE_fcstFV3_obsGOES_BrightnessTemp::model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp.conf,model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp/ci_overrides.conf -8::MODE_fcstFV3_obsGOES_BrightnessTempObjs:: model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf -9::METdbLoad_fcstFV3_obsGoes_BrightnessTemp::model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf:: metdatadb_env,metviewer +Category: short_range +0::EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField::model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf +1::MODE_fcstHRRR_obsMRMS_Hail_GRIB2::model_applications/short_range/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf +2::EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere::model_applications/short_range/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf +3::GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere::model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf +4::GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb::model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf +5::Point2Grid_obsLSR_ObsOnly_PracticallyPerfect::model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf +6::GridStat_fcstFV3_obsGOES_BrightnessTempDmap:: model_applications/short_range/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf +7::MODE_fcstFV3_obsGOES_BrightnessTemp::model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp.conf,model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp/ci_overrides.conf +8::MODE_fcstFV3_obsGOES_BrightnessTempObjs:: model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf +9::METdbLoad_fcstFV3_obsGoes_BrightnessTemp::model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf:: metdataio_env,metviewer Category: data_assimilation @@ -125,20 +125,26 @@ Category: precipitation Category: s2s 0::GridStat_SeriesAnalysis_fcstNMME_obsCPC_seasonal_forecast:: model_applications/s2s/GridStat_SeriesAnalysis_fcstNMME_obsCPC_seasonal_forecast.conf:: netcdf4_env -1::UserScript_fcstGFS_obsERA_Blocking:: model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking.conf:: metplotpy_env,cartopy,metplus -2::UserScript_obsERA_obsOnly_Blocking:: model_applications/s2s/UserScript_obsERA_obsOnly_Blocking.conf:: metplotpy_env,cartopy,metplus -3::UserScript_obsERA_obsOnly_WeatherRegime:: model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime.conf:: weatherregime_env,cartopy,metplus -4::TCGen_fcstGFSO_obsBDECKS_GDF_TDF:: model_applications/s2s/TCGen_fcstGFSO_obsBDECKS_GDF_TDF.conf:: metplotpy_env,cartopy,metplus -5::UserScript_obsPrecip_obsOnly_Hovmoeller:: model_applications/s2s/UserScript_obsPrecip_obsOnly_Hovmoeller.conf:: metplotpy_env,cartopy -6:: UserScript_obsPrecip_obsOnly_CrossSpectraPlot:: model_applications/s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot.conf:: spacetime_env -7:: UserScript_obsERA_obsOnly_PhaseDiagram:: model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.conf:: spacetime_env -8:: UserScript_fcstGFS_obsERA_OMI:: model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.conf:: spacetime_env, metdatadb -9:: UserScript_obsERA_obsOnly_OMI:: model_applications/s2s/UserScript_obsERA_obsOnly_OMI.conf:: spacetime_env, metdatadb -10:: UserScript_obsERA_obsOnly_RMM:: model_applications/s2s/UserScript_obsERA_obsOnly_RMM.conf:: spacetime_env, metdatadb -11:: UserScript_fcstGFS_obsERA_WeatherRegime:: model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.conf:: weatherregime_env,cartopy,metplus -12:: UserScript_obsERA_obsOnly_Stratosphere:: model_applications/s2s/UserScript_obsERA_obsOnly_Stratosphere.conf:: metplotpy_env,metdatadb -13::SeriesAnalysis_fcstCFSv2_obsGHCNCAMS_climoStandardized_MultiStatisticTool:: model_applications/s2s/SeriesAnalysis_fcstCFSv2_obsGHCNCAMS_climoStandardized_MultiStatisticTool.conf:: netcdf4_env -14::GridStat_fcstCFSv2_obsGHCNCAMS_MultiTercile:: model_applications/s2s/GridStat_fcstCFSv2_obsGHCNCAMS_MultiTercile.conf:: netcdf4_env +1::TCGen_fcstGFSO_obsBDECKS_GDF_TDF:: model_applications/s2s/TCGen_fcstGFSO_obsBDECKS_GDF_TDF.conf:: metplotpy_env,cartopy,metplus +2::UserScript_obsPrecip_obsOnly_Hovmoeller:: model_applications/s2s/UserScript_obsPrecip_obsOnly_Hovmoeller.conf:: metplotpy_env,cartopy +3:: UserScript_obsPrecip_obsOnly_CrossSpectraPlot:: model_applications/s2s/UserScript_obsPrecip_obsOnly_CrossSpectraPlot.conf:: spacetime_env +4:: UserScript_obsERA_obsOnly_Stratosphere:: model_applications/s2s/UserScript_obsERA_obsOnly_Stratosphere.conf:: metplotpy_env,metdataio +5::SeriesAnalysis_fcstCFSv2_obsGHCNCAMS_climoStandardized_MultiStatisticTool:: model_applications/s2s/SeriesAnalysis_fcstCFSv2_obsGHCNCAMS_climoStandardized_MultiStatisticTool.conf:: netcdf4_env +6::GridStat_fcstCFSv2_obsGHCNCAMS_MultiTercile:: model_applications/s2s/GridStat_fcstCFSv2_obsGHCNCAMS_MultiTercile.conf:: netcdf4_env + + +Category: s2s_mid_lat +0::UserScript_fcstGFS_obsERA_Blocking:: model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking.conf:: metplotpy_env,cartopy,metplus +1::UserScript_obsERA_obsOnly_Blocking:: model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking.conf:: metplotpy_env,cartopy,metplus +2::UserScript_obsERA_obsOnly_WeatherRegime:: model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime.conf:: weatherregime_env,cartopy,metplus +3:: UserScript_fcstGFS_obsERA_WeatherRegime:: model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime.conf:: weatherregime_env,cartopy,metplus + +Category: s2s_mjo +0:: UserScript_obsERA_obsOnly_PhaseDiagram:: model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram.conf:: spacetime_env +1:: UserScript_fcstGFS_obsERA_OMI:: model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI.conf:: spacetime_env, metdataio +2:: UserScript_obsERA_obsOnly_OMI:: model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI.conf:: spacetime_env, metdataio +3:: UserScript_obsERA_obsOnly_RMM:: model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM.conf:: spacetime_env, metdataio + Category: space_weather 0::GridStat_fcstGloTEC_obsGloTEC_vx7:: model_applications/space_weather/GridStat_fcstGloTEC_obsGloTEC_vx7.conf diff --git a/internal_tests/use_cases/metplus_use_case_suite.py b/internal_tests/use_cases/metplus_use_case_suite.py index 5f0397afb5..d194b4c3ae 100644 --- a/internal_tests/use_cases/metplus_use_case_suite.py +++ b/internal_tests/use_cases/metplus_use_case_suite.py @@ -403,8 +403,14 @@ def parse_all_use_cases_file(): num_cases += 1 return all_cases, num_cases - +################################################################################ if __name__ == "__main__": + # NOTE: This list of use cases to run is not maintaned, so it no longer + # contains the full list of existing use cases. + # It is not recommended to run the use cases by calling this script + # directly. This more serves as a reference of how use case commands + # can be generated. + # run all use cases all_use_cases = METplusUseCaseSuite() @@ -412,8 +418,6 @@ def parse_all_use_cases_file(): all_use_cases.add_use_case_groups('climate') - all_use_cases.add_use_case_groups('convection_allowing_models') - all_use_cases.add_use_case_groups('cryosphere') all_use_cases.add_use_case_groups('data_assimilation') @@ -430,6 +434,8 @@ def parse_all_use_cases_file(): all_use_cases.add_use_case_groups('precipitation') + all_use_cases.add_use_case_groups('short_range') + all_use_cases.add_use_case_groups('s2s&space_weather&tc_and_extra_tc') all_use_cases.print() diff --git a/internal_tests/use_cases/test_use_cases.py b/internal_tests/use_cases/test_use_cases.py index f70bcfeb24..0f62f41645 100644 --- a/internal_tests/use_cases/test_use_cases.py +++ b/internal_tests/use_cases/test_use_cases.py @@ -120,12 +120,14 @@ def main(): parser.add_argument('host_id', action='store') parser.add_argument('--met_tool_wrapper', action='store_true', required=False) parser.add_argument('--climate', action='store_true', required=False) - parser.add_argument('--convection_allowing_models', action='store_true', required=False) parser.add_argument('--cryosphere', action='store_true', required=False) parser.add_argument('--medium_range1', action='store_true', required=False) parser.add_argument('--medium_range2', action='store_true', required=False) parser.add_argument('--precipitation', action='store_true', required=False) + parser.add_argument('--short_range', action='store_true', required=False) parser.add_argument('--s2s', action='store_true', required=False) + parser.add_argument('--s2s_mid_lat', action='store_true', required=False) + parser.add_argument('--s2s_mjo', action='store_true', required=False) parser.add_argument('--space_weather', action='store_true', required=False) parser.add_argument('--tc_and_extra_tc', action='store_true', required=False) parser.add_argument('--all', action='store_true', required=False) diff --git a/metplus/wrappers/met_db_load_wrapper.py b/metplus/wrappers/met_db_load_wrapper.py index 63fe189714..e5a8783935 100755 --- a/metplus/wrappers/met_db_load_wrapper.py +++ b/metplus/wrappers/met_db_load_wrapper.py @@ -148,7 +148,7 @@ def run_at_time_once(self, time_info): return success def get_all_files(self, custom=None): - """! Don't get list of all files for METdataDB wrapper + """! Don't get list of all files for METdbLoad wrapper @returns True to report that no failures occurred """ diff --git a/parm/use_cases/met_tool_wrapper/METdbLoad/METdbLoad.conf b/parm/use_cases/met_tool_wrapper/METdbLoad/METdbLoad.conf index de92ab8245..1ddcb184ae 100644 --- a/parm/use_cases/met_tool_wrapper/METdbLoad/METdbLoad.conf +++ b/parm/use_cases/met_tool_wrapper/METdbLoad/METdbLoad.conf @@ -50,7 +50,7 @@ MET_DB_LOAD_INPUT_TEMPLATE = {INPUT_BASE}/met_test/out/grid_stat # https://metplus.readthedocs.io/en/latest/Users_Guide/wrappers.html#metdbload ### -MET_DATA_DB_DIR = {METPLUS_BASE}/../METdatadb +MET_DATA_DB_DIR = {METPLUS_BASE}/../METdataio MET_DB_LOAD_XML_FILE = {PARM_BASE}/use_cases/met_tool_wrapper/METdbLoad/METdbLoadConfig.xml diff --git a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking.conf b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking.conf similarity index 90% rename from parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking.conf rename to parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking.conf index f207304e8d..d3b346a661 100644 --- a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking.conf +++ b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking.conf @@ -48,19 +48,19 @@ SKIP_TIMES = "%m:begin_end_incr(3,11,1)", "%m%d:0229" LOOP_ORDER = processes # location of configuration files used by MET applications -CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s +CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s_mid_lat -OBS_ANOM_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Anomaly +OBS_ANOM_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Anomaly OBS_ANOM_INPUT_TEMPLATE = Z500_anomaly_{valid?fmt=%Y%m%d}_NH.nc OBS_ANOM_OUTPUT_DIR = {OBS_ANOM_INPUT_DIR} OBS_ANOM_OUTPUT_TEMPLATE = ERA_anom_files_lead{lead?fmt=%HHH}.txt -OBS_AVE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily +OBS_AVE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily OBS_AVE_INPUT_TEMPLATE = Z500_daily_{valid?fmt=%Y%m%d}_NH.nc OBS_AVE_OUTPUT_DIR = {OBS_AVE_INPUT_DIR} OBS_AVE_OUTPUT_TEMPLATE = ERA_daily_files_lead{lead?fmt=%HHH}.txt -FCST_AVE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/GFS/Daily +FCST_AVE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/GFS/Daily FCST_AVE_INPUT_TEMPLATE = Z500_daily_{init?fmt=%Y%m%d}_{lead?fmt=%HHH}_NH.nc FCST_AVE_OUTPUT_DIR = {FCST_AVE_INPUT_DIR} FCST_AVE_OUTPUT_TEMPLATE = GFS_daily_files_lead{lead?fmt=%HHH}.txt @@ -114,7 +114,7 @@ REGRID_DATA_PLANE_WIDTH = 2 # input and output data directories for each application in PROCESS_LIST FCST_REGRID_DATA_PLANE_INPUT_DIR = /gpfs/fs1/p/ral/jntp/GMTB/Phys_Test_FV3GFSv2/POST/suite1/ -FCST_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/FV3GFS/Regrid +FCST_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/FV3GFS/Regrid # format of filenames # Input ERA Interim @@ -169,7 +169,7 @@ REGRID_DATA_PLANE_WIDTH = 2 # input and output data directories for each application in PROCESS_LIST OBS_REGRID_DATA_PLANE_INPUT_DIR = /gpfs/fs1/collections/rda/data/ds627.0/ei.oper.an.pl -OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Regrid +OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Regrid # format of filenames # Input ERA Interim @@ -215,7 +215,7 @@ OBS_PCP_COMBINE_OUTPUT_ACCUM = 24 OBS_PCP_COMBINE_DERIVE_LOOKBACK = 24 # input and output data directories for each application in PROCESS_LIST -OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Regrid +OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Regrid OBS_PCP_COMBINE_OUTPUT_DIR = {OBS_AVE_INPUT_DIR} # Input ERA Interim @@ -265,8 +265,8 @@ OBS_PCP_COMBINE_OUTPUT_ACCUM = 120 OBS_PCP_COMBINE_DERIVE_LOOKBACK = 120 # input and output data directories for each application in PROCESS_LIST -OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily -OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Rmean5d +OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily +OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Rmean5d # format of filenames # Input ERA Interim @@ -308,7 +308,7 @@ OBS_PCP_COMBINE_METHOD = USER_DEFINED OBS_PCP_COMBINE_COMMAND = -subtract {OBS_PCP_COMBINE_INPUT_DIR}/Daily/Z500_daily_{valid?fmt=%Y%m%d}_NH.nc {OBS_PCP_COMBINE_INPUT_DIR}/Rmean5d/Z500_5daymean_{valid?fmt=%Y%m%d}_NH.nc -field 'name="Z500"; level="(*,*)";' # input and output data directories for each application in PROCESS_LIST -OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA +OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA OBS_PCP_COMBINE_OUTPUT_DIR = {OBS_ANOM_INPUT_DIR} # format of filenames @@ -332,7 +332,7 @@ VALID_INCREMENT = 86400 LEAD_SEQ = 0 # Template of filenames to input to the user-script -USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Anomaly/Z500_anomaly_{valid?fmt=%Y%m%d}_NH.nc +USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Anomaly/Z500_anomaly_{valid?fmt=%Y%m%d}_NH.nc # Name of the file containing the listing of input files USER_SCRIPT_INPUT_TEMPLATE_LABELS = OBS_CBL_INPUT @@ -406,10 +406,10 @@ FCST_BLOCK_METHOD = PH OBS_BLOCK_METHOD = {FCST_BLOCK_METHOD} # Location of output MPR files -BLOCKING_MPR_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/mpr +BLOCKING_MPR_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/mpr # Plots Output Dir -BLOCKING_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/plots +BLOCKING_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/plots #CBL plot title and output namename OBS_CBL_PLOT_MTHSTR = DJF @@ -436,7 +436,7 @@ SKIP_TIMES = "%m:begin_end_incr(3,11,1)", "%m%d:1201,0229" USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE_PER_LEAD # Template of filenames to input to the user-script -USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily/Z500_daily_{valid?fmt=%Y%m%d}_NH.nc,{INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/GFS/Daily/Z500_{init?fmt=%Y%m%d}_{lead?fmt=%HHH}_NH.nc +USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily/Z500_daily_{valid?fmt=%Y%m%d}_NH.nc,{INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/GFS/Daily/Z500_{init?fmt=%Y%m%d}_{lead?fmt=%HHH}_NH.nc # Name of the file containing the listing of input files # The options are OBS_CBL_INPUT, FCST_CBL_INPUT, OBS_IBL_INPUT, and FCST_IBL_INPUT @@ -444,7 +444,7 @@ USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_fcst USER_SCRIPT_INPUT_TEMPLATE_LABELS = OBS_IBL_INPUT, FCST_IBL_INPUT # Command to run the user script with input configuration file -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/Blocking_driver.py +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/Blocking_driver.py # Stat Analysis for the IBLs @@ -494,10 +494,10 @@ LINE_TYPE_LIST = MPR GROUP_LIST_ITEMS = MODEL_LIST LOOP_LIST_ITEMS = FCST_LEAD_LIST -MODEL1_STAT_ANALYSIS_LOOKIN_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/mpr/IBL +MODEL1_STAT_ANALYSIS_LOOKIN_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/mpr/IBL # Output data directory -STAT_ANALYSIS_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking +STAT_ANALYSIS_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking CONFIG_DIR = {PARM_BASE}/met_config @@ -561,10 +561,10 @@ LINE_TYPE_LIST = MPR GROUP_LIST_ITEMS = MODEL_LIST LOOP_LIST_ITEMS = FCST_LEAD_LIST -MODEL1_STAT_ANALYSIS_LOOKIN_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/mpr/Blocks +MODEL1_STAT_ANALYSIS_LOOKIN_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/mpr/Blocks # Output data directory -STAT_ANALYSIS_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking +STAT_ANALYSIS_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking CONFIG_DIR = {PARM_BASE}/met_config diff --git a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/Blocking_driver.py b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/Blocking_driver.py similarity index 100% rename from parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/Blocking_driver.py rename to parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/Blocking_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.conf b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime.conf similarity index 90% rename from parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.conf rename to parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime.conf index 02f48837cb..5a69011610 100644 --- a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime.conf +++ b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime.conf @@ -48,7 +48,7 @@ SKIP_TIMES = "%m:begin_end_incr(3,11,1)", "%m%d:1201,0229" LOOP_ORDER = processes # location of configuration files used by MET applications -CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s +CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s_mid_lat # Regridding Pre-Processing Step @@ -91,8 +91,8 @@ REGRID_DATA_PLANE_METHOD = BILIN REGRID_DATA_PLANE_WIDTH = 2 # input and output data directories for each application in PROCESS_LIST -OBS_REGRID_DATA_PLANE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/OrigData -OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Regrid +OBS_REGRID_DATA_PLANE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/OrigData +OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Regrid # format of filenames # Input and output ERA Interim @@ -130,8 +130,8 @@ OBS_PCP_COMBINE_DERIVE_LOOKBACK = 24 OBS_PCP_COMBINE_OUTPUT_NAME = Z500 # input and output data directories for each application in PROCESS_LIST -OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Regrid -OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Daily +OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Regrid +OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Daily # Input ERA Interim OBS_PCP_COMBINE_INPUT_TEMPLATE = {valid?fmt=%Y%m%d}/Z500_6hourly_{valid?fmt=%Y%m%d%H}_NH.nc @@ -194,10 +194,10 @@ OBS_WR_OUTPUT_FILE_TYPE = text OBS_WR_OUTPUT_FILE = obs_weather_regime_class FCST_WR_OUTPUT_FILE_TYPE = text FCST_WR_OUTPUT_FILE = fcst_weather_regime_class -WR_OUTPUT_FILE_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime +WR_OUTPUT_FILE_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime # Directory to send output plots -WR_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/plots/ +WR_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/plots/ # Elbow Plot Title and output file name OBS_ELBOW_PLOT_TITLE = ERA Elbow Method For Optimal k @@ -224,7 +224,7 @@ FCST_FREQ_PLOT_OUTPUT_NAME = fcst_freq # MPR file information MASK_NAME = FULL -WR_MPR_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/mpr +WR_MPR_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/mpr # Run the Weather Regime Script @@ -236,7 +236,7 @@ LEAD_SEQ = 24 USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE_PER_LEAD # Template of filenames to input to the user-script -USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Daily/Z500_daily_{valid?fmt=%Y%m%d}_NH.nc,{INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/GFS/Daily/Z500_{init?fmt=%Y%m%d}_{lead?fmt=%HHH}_NH.nc +USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Daily/Z500_daily_{valid?fmt=%Y%m%d}_NH.nc,{INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/GFS/Daily/Z500_{init?fmt=%Y%m%d}_{lead?fmt=%HHH}_NH.nc # Name of the file containing the listing of input files # The options are OBS_INPUT for observations or FCST_INPUT for forecast @@ -245,7 +245,7 @@ USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_fcst USER_SCRIPT_INPUT_TEMPLATE_LABELS = OBS_INPUT, FCST_INPUT # Command to run the user script with input configuration file -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py [sanal_wrclass] @@ -294,10 +294,10 @@ LINE_TYPE_LIST = MPR GROUP_LIST_ITEMS = MODEL_LIST LOOP_LIST_ITEMS = FCST_LEAD_LIST -MODEL1_STAT_ANALYSIS_LOOKIN_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/mpr/WeatherRegime +MODEL1_STAT_ANALYSIS_LOOKIN_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/mpr/WeatherRegime # Output data directory -STAT_ANALYSIS_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime +STAT_ANALYSIS_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime CONFIG_DIR = {PARM_BASE}/met_config @@ -360,10 +360,10 @@ LINE_TYPE_LIST = MPR GROUP_LIST_ITEMS = MODEL_LIST LOOP_LIST_ITEMS = FCST_LEAD_LIST -MODEL1_STAT_ANALYSIS_LOOKIN_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/mpr/freq +MODEL1_STAT_ANALYSIS_LOOKIN_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/mpr/freq # Output data directory -STAT_ANALYSIS_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime +STAT_ANALYSIS_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime CONFIG_DIR = {PARM_BASE}/met_config diff --git a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py similarity index 100% rename from parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py rename to parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking.conf b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking.conf similarity index 89% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking.conf rename to parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking.conf index 7d4bc1d83e..1b35aa2e51 100644 --- a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking.conf +++ b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking.conf @@ -47,7 +47,7 @@ SKIP_TIMES = "%m:begin_end_incr(3,11,1)", "%m%d:0229" LOOP_ORDER = processes # location of configuration files used by MET applications -CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s +CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s_mid_lat # Run the obs data # A variable set to be used in the pre-processing steps @@ -89,7 +89,7 @@ REGRID_DATA_PLANE_WIDTH = 2 # input and output data directories for each application in PROCESS_LIST OBS_REGRID_DATA_PLANE_INPUT_DIR = /gpfs/fs1/collections/rda/data/ds627.0/ei.oper.an.pl -OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Regrid +OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Regrid # format of filenames # Input ERA Interim @@ -128,8 +128,8 @@ OBS_PCP_COMBINE_DERIVE_LOOKBACK = 24 OBS_PCP_COMBINE_OUTPUT_NAME = Z500 # Input and output Data directories for each application in PROCESS_LIST -OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Regrid -OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily +OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Regrid +OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily # Input and Output filename templates, ERA Interim OBS_PCP_COMBINE_INPUT_TEMPLATE = {valid?fmt=%Y%m%d}/Z500_6hourly_{valid?fmt=%Y%m%d%H}_NH.nc @@ -163,8 +163,8 @@ OBS_PCP_COMBINE_DERIVE_LOOKBACK = 120 OBS_PCP_COMBINE_OUTPUT_NAME = Z500 # input and output data directories for each application in PROCESS_LIST -OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily -OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Rmean5d +OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily +OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Rmean5d # format of filenames # Input ERA Interim @@ -188,8 +188,8 @@ OBS_PCP_COMBINE_METHOD = USER_DEFINED OBS_PCP_COMBINE_COMMAND = -subtract {OBS_PCP_COMBINE_INPUT_DIR}/Daily/Z500_daily_{valid?fmt=%Y%m%d}_NH.nc {OBS_PCP_COMBINE_INPUT_DIR}/Rmean5d/Z500_5daymean_{valid?fmt=%Y%m%d}_NH.nc -field 'name="Z500"; level="(*,*)";' # input and output data directories for each application in PROCESS_LIST -OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA -OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Anomaly +OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA +OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Anomaly # format of filenames # Input ERA Interim @@ -249,7 +249,7 @@ OBS_BLOCK_TRAVEL = 45 OBS_BLOCK_METHOD = PH # Plot Output Directory -BLOCKING_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_Blocking/plots/ +BLOCKING_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking/plots/ #CBL plot title and name OBS_CBL_PLOT_MTHSTR = DJF @@ -273,7 +273,7 @@ SKIP_TIMES = "%m:begin_end_incr(3,11,1)", "%m%d:1201,1202,0227,0228,0229" USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE_PER_LEAD # Template of filenames to input to the user-script -USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Anomaly/Z500_anomaly_{valid?fmt=%Y%m%d}_NH.nc,{INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily/Z500_daily_{valid?fmt=%Y%m%d}_NH.nc +USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Anomaly/Z500_anomaly_{valid?fmt=%Y%m%d}_NH.nc,{INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_Blocking/ERA/Daily/Z500_daily_{valid?fmt=%Y%m%d}_NH.nc # Name of the file containing the listing of input files # The options are OBS_CBL_INPUT, FCST_CBL_INPUT, OBS_IBL_INPUT, and FCST_IBL_INPUT @@ -281,4 +281,4 @@ USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_fcst USER_SCRIPT_INPUT_TEMPLATE_LABELS = OBS_CBL_INPUT,OBS_IBL_INPUT # Command to run the user script with input configuration file -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking/Blocking_driver.py +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking/Blocking_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking/Blocking_driver.py b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking/Blocking_driver.py similarity index 100% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_Blocking/Blocking_driver.py rename to parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_Blocking/Blocking_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime.conf b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime.conf similarity index 88% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime.conf rename to parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime.conf index 8b17e73718..6f1a60d786 100644 --- a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime.conf +++ b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime.conf @@ -47,7 +47,7 @@ SKIP_TIMES = "%m:begin_end_incr(3,11,1)", "%m%d:0229" LOOP_ORDER = processes # location of configuration files used by MET applications -CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s +CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s_mid_lat # Regridding Pre-Processing Step @@ -90,8 +90,8 @@ REGRID_DATA_PLANE_METHOD = BILIN REGRID_DATA_PLANE_WIDTH = 2 # input and output data directories for each application in PROCESS_LIST -OBS_REGRID_DATA_PLANE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/OrigData -OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Regrid +OBS_REGRID_DATA_PLANE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/OrigData +OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Regrid # format of filenames # Input and output ERA Interim @@ -129,8 +129,8 @@ OBS_PCP_COMBINE_DERIVE_LOOKBACK = 24 OBS_PCP_COMBINE_OUTPUT_NAME = Z500 # input and output data directories for each application in PROCESS_LIST -OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Regrid -OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Daily +OBS_PCP_COMBINE_INPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Regrid +OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Daily # Input ERA Interim OBS_PCP_COMBINE_INPUT_TEMPLATE = {valid?fmt=%Y%m%d}/Z500_6hourly_{valid?fmt=%Y%m%d%H}_NH.nc @@ -174,10 +174,10 @@ OBS_WR_FREQ = 7 # Type options are text or netcdf OBS_WR_OUTPUT_FILE_TYPE = text OBS_WR_OUTPUT_FILE = obs_weather_regime_class -WR_OUTPUT_FILE_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime +WR_OUTPUT_FILE_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime # Directory to send output plots -WR_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/plots/ +WR_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/plots/ # Elbow Plot Title and output file name OBS_ELBOW_PLOT_TITLE = ERA Elbow Method For Optimal k @@ -197,7 +197,7 @@ OBS_FREQ_PLOT_OUTPUT_NAME = obs_freq # MPR file information MASK_NAME = FULL -WR_MPR_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/mpr +WR_MPR_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/mpr # Run the Weather Regime Script @@ -206,7 +206,7 @@ WR_MPR_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/mp USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE_PER_LEAD # Template of filenames to input to the user-script -USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Daily/Z500_daily_{valid?fmt=%Y%m%d}_NH.nc +USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/ERA/Daily/Z500_daily_{valid?fmt=%Y%m%d}_NH.nc # Name of the file containing the listing of input files # The options are OBS_INPUT for observations or FCST_INPUT for forecast @@ -215,4 +215,4 @@ USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_fcst USER_SCRIPT_INPUT_TEMPLATE_LABELS = OBS_INPUT # Command to run the user script with input configuration file -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mid_lat/UserScript_fcstGFS_obsERA_WeatherRegime/WeatherRegime_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime/WeatherRegime_driver.py b/parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime/WeatherRegime_driver.py similarity index 100% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_WeatherRegime/WeatherRegime_driver.py rename to parm/use_cases/model_applications/s2s_mid_lat/UserScript_obsERA_obsOnly_WeatherRegime/WeatherRegime_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.conf b/parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI.conf similarity index 91% rename from parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.conf rename to parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI.conf index 8ca46eba79..99fc2cc2a7 100644 --- a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI.conf +++ b/parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI.conf @@ -43,7 +43,7 @@ LEAD_SEQ = 0 LOOP_ORDER = processes # location of configuration files used by MET applications -CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s +CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s_mjo # Run the obs for these cases OBS_RUN = True @@ -59,11 +59,11 @@ REGRID_DATA_PLANE_METHOD = NEAREST REGRID_DATA_PLANE_WIDTH = 1 # Input and Output Directories for the OBS OLR Files and output text file containing the file list -OBS_OLR_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/ERA/Regrid +OBS_OLR_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/ERA/Regrid OBS_OLR_INPUT_TEMPLATE = OLR_{valid?fmt=%Y%m%d}.nc # Input and Output Directories for the OBS OLR Files and output text file containing the file list -FCST_OLR_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/GFS/Regrid +FCST_OLR_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/GFS/Regrid FCST_OLR_INPUT_TEMPLATE = OLR_{valid?fmt=%Y%m%d}.nc @@ -81,7 +81,7 @@ FCST_PCP_COMBINE_COMMAND = -derive mean {FCST_PCP_COMBINE_INPUT_DIR}/{valid?fmt= FCST_PCP_COMBINE_INPUT_DIR = /gpfs/fs1/collections/rda/data/ds084.1 FCST_PCP_COMBINE_INPUT_TEMPLATE = {valid?fmt=%Y%m}/gfs.0p25.{init?fmt=%y%m%d%H}.f{lead?fmt=%HHH}.grib2 -FCST_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_OMI/GFS/daily_mean +FCST_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/GFS/daily_mean FCST_PCP_COMBINE_OUTPUT_TEMPLATE = GFS_mean_{valid?fmt=%Y%m%d}.nc @@ -108,7 +108,7 @@ OBS_REGRID_DATA_PLANE_VAR1_OPTIONS = file_type=NETCDF_NCCF; censor_thresh=eq-999 OBS_REGRID_DATA_PLANE_VAR1_OUTPUT_FIELD_NAME = olr # input and output data directories for each application in PROCESS_LIST -OBS_REGRID_DATA_PLANE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/ERA/daily_mean +OBS_REGRID_DATA_PLANE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/ERA/daily_mean OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OBS_OLR_INPUT_DIR} # format of filenames @@ -136,7 +136,7 @@ FCST_REGRID_DATA_PLANE_VAR1_LEVELS = "(*,*)" FCST_REGRID_DATA_PLANE_VAR1_OUTPUT_FIELD_NAME = olr # input and output data directories for each application in PROCESS_LIST -FCST_REGRID_DATA_PLANE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/GFS/daily_mean +FCST_REGRID_DATA_PLANE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/GFS/daily_mean FCST_REGRID_DATA_PLANE_OUTPUT_DIR = {FCST_OLR_INPUT_DIR} # format of filenames @@ -156,7 +156,7 @@ VALID_END = 2012123100 # Find the EOF files for each time # Filename templates for EOF1 and EOF2 -USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/EOF/eof1/eof{valid?fmt=%j}.txt,{INPUT_BASE}/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/EOF/eof2/eof{valid?fmt=%j}.txt +USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/EOF/eof1/eof{valid?fmt=%j}.txt,{INPUT_BASE}/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/EOF/eof2/eof{valid?fmt=%j}.txt # Name of the file containing the listing of input files # The options are EOF1_INPUT and EOF2_INPUT @@ -182,7 +182,7 @@ OBS_PER_DAY = 1 # Output Directory for the plots # If not set, it this will default to {OUTPUT_BASE}/plots -OMI_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_fcstGFS_obsERA_OMI/plots +OMI_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/plots # Phase Plot start date, end date, output name, and format PHASE_PLOT_TIME_BEG = 2017010100 @@ -208,4 +208,4 @@ USER_SCRIPT_INPUT_TEMPLATE = {OBS_OLR_INPUT_DIR}/{OBS_OLR_INPUT_TEMPLATE},{FCST_ USER_SCRIPT_INPUT_TEMPLATE_LABELS = OBS_OLR_INPUT,FCST_OLR_INPUT # Command to run the user script with input configuration file -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/OMI_driver.py +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/OMI_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/OMI_driver.py b/parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/OMI_driver.py similarity index 100% rename from parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/OMI_driver.py rename to parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/OMI_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/read_netcdf.yaml b/parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/read_netcdf.yaml similarity index 100% rename from parm/use_cases/model_applications/s2s/UserScript_fcstGFS_obsERA_OMI/read_netcdf.yaml rename to parm/use_cases/model_applications/s2s_mjo/UserScript_fcstGFS_obsERA_OMI/read_netcdf.yaml diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI.conf b/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI.conf similarity index 91% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI.conf rename to parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI.conf index fff56cde25..19d97d361b 100644 --- a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI.conf +++ b/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI.conf @@ -43,7 +43,7 @@ LEAD_SEQ = 0 LOOP_ORDER = processes # location of configuration files used by MET applications -CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s +CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s_mjo # Run the obs for these cases OBS_RUN = True @@ -59,7 +59,7 @@ REGRID_DATA_PLANE_METHOD = NEAREST REGRID_DATA_PLANE_WIDTH = 1 # Input and Output Directories for the OBS OLR Files and output text file containing the file list -OBS_OLR_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_OMI/ERA +OBS_OLR_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI/ERA OBS_OLR_INPUT_TEMPLATE = OLR_{valid?fmt=%Y%m%d}.nc @@ -84,7 +84,7 @@ OBS_REGRID_DATA_PLANE_VAR1_OPTIONS = file_type=NETCDF_NCCF; censor_thresh=eq-999 OBS_REGRID_DATA_PLANE_VAR1_OUTPUT_FIELD_NAME = olr # input and output data directories for each application in PROCESS_LIST -OBS_REGRID_DATA_PLANE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_OMI +OBS_REGRID_DATA_PLANE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OBS_OLR_INPUT_DIR} # format of filenames @@ -104,7 +104,7 @@ VALID_END = 2012123100 # Find the EOF files for each time # Filename templates for EOF1 and EOF2 -USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_OMI/EOF/eof1/eof{valid?fmt=%j}.txt,{INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_OMI/EOF/eof2/eof{valid?fmt=%j}.txt +USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI/EOF/eof1/eof{valid?fmt=%j}.txt,{INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI/EOF/eof2/eof{valid?fmt=%j}.txt # Name of the file containing the listing of input files # The options are EOF1_INPUT and EOF2_INPUT @@ -130,7 +130,7 @@ OBS_PER_DAY = 1 # Output Directory for the plots # If not set, it this will default to {OUTPUT_BASE}/plots -OMI_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_OMI/plots +OMI_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_OMI/plots # Phase Plot start date, end date, output name, and format PHASE_PLOT_TIME_BEG = 2012010100 @@ -154,4 +154,4 @@ USER_SCRIPT_INPUT_TEMPLATE = {OBS_OLR_INPUT_DIR}/{OBS_OLR_INPUT_TEMPLATE} USER_SCRIPT_INPUT_TEMPLATE_LABELS = OBS_OLR_INPUT # Command to run the user script with input configuration file -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI/OMI_driver.py +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI/OMI_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI/OMI_driver.py b/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI/OMI_driver.py similarity index 100% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_OMI/OMI_driver.py rename to parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_OMI/OMI_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.conf b/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram.conf similarity index 86% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.conf rename to parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram.conf index 7f435f4034..bb8168e9b4 100644 --- a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram.conf +++ b/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram.conf @@ -41,7 +41,7 @@ LEAD_SEQ = 0 LOOP_ORDER = processes # location of configuration files used by MET applications -CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s +CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s_mjo # Run the obs for these cases OBS_RUN = True @@ -50,7 +50,7 @@ FCST_RUN = False # Input and Output Directories for the OBS OLR Files and output text file containing the file list OBS_PDTIME_FMT = %Y%m%d-%H%M%S OBS_PDTIME_INPUT_TEMPLATE = {valid?fmt=%Y%m%d-%H%M%S} -OBS_PDTIME_OUTPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/ +OBS_PDTIME_OUTPUT_DIR = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram/ OBS_PDTIME_OUTPUT_TEMPLATE = time_list_lead{lead?fmt=%HHH}.txt @@ -59,7 +59,7 @@ OBS_PDTIME_OUTPUT_TEMPLATE = time_list_lead{lead?fmt=%HHH}.txt # Find the files for each time USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE_FOR_EACH -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/save_input_files_txt.py {OBS_PDTIME_INPUT_TEMPLATE} {OBS_PDTIME_OUTPUT_DIR}/{OBS_PDTIME_OUTPUT_TEMPLATE} +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram/save_input_files_txt.py {OBS_PDTIME_INPUT_TEMPLATE} {OBS_PDTIME_OUTPUT_DIR}/{OBS_PDTIME_OUTPUT_TEMPLATE} # Configurations for the Phase Diagram Plotting Script @@ -86,7 +86,7 @@ OBS_PHASE_DIAGRAM_INPUT_TIMELIST_TEXTFILE = {OBS_PDTIME_OUTPUT_DIR}/{OBS_PDTIME_ OBS_PHASE_DIAGRAM_INPUT_TIME_FMT = {OBS_PDTIME_FMT} # Plot Output Directory -PHASE_DIAGRAM_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/plots +PHASE_DIAGRAM_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram/plots # Plot Ouptut Name OBS_PHASE_PLOT_OUTPUT_NAME = RMM_phase_diagram @@ -99,4 +99,4 @@ OBS_PHASE_PLOT_OUTPUT_NAME = RMM_phase_diagram USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE_PER_LEAD # Command to run the user script with input configuration file -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/PhaseDiagram_driver.py +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram/PhaseDiagram_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/PhaseDiagram_driver.py b/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram/PhaseDiagram_driver.py similarity index 100% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/PhaseDiagram_driver.py rename to parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram/PhaseDiagram_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/save_input_files_txt.py b/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram/save_input_files_txt.py similarity index 100% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_PhaseDiagram/save_input_files_txt.py rename to parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_PhaseDiagram/save_input_files_txt.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM.conf b/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM.conf similarity index 82% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM.conf rename to parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM.conf index 495a124b2f..8f6b64b8c4 100644 --- a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM.conf +++ b/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM.conf @@ -43,7 +43,7 @@ LEAD_SEQ = 0 LOOP_ORDER = processes # location of configuration files used by MET applications -CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s +CONFIG_DIR={PARM_BASE}/use_cases/model_applications/s2s_mjo # Run the obs for these cases OBS_RUN = True @@ -90,10 +90,10 @@ OBS_PCP_COMBINE_METHOD = USER_DEFINED OBS_PCP_COMBINE_COMMAND = -derive mean {OBS_PCP_COMBINE_INPUT_DIR}/{OBS_PCP_COMBINE_INPUT_TEMPLATE} -field 'name="U_P850_mean"; level="(*,*)"; set_attr_valid = "{valid?fmt=%Y%m%d_%H%M%S}";' -field 'name="U_P200_mean"; level="(*,*)"; set_attr_valid = "{valid?fmt=%Y%m%d_%H%M%S}";' -name U_P850_mean,U_P200_mean -OBS_PCP_COMBINE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean +OBS_PCP_COMBINE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean OBS_PCP_COMBINE_INPUT_TEMPLATE = ERA_wind_daily_mean_*{valid?fmt=%m%d}.nc -OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/mean_daily_annual_cycle +OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/mean_daily_annual_cycle OBS_PCP_COMBINE_OUTPUT_TEMPLATE = ERA_wind_daily_annual_{valid?fmt=%m%d}.nc @@ -128,10 +128,10 @@ OBS_PCP_COMBINE_METHOD = USER_DEFINED OBS_PCP_COMBINE_COMMAND = -derive mean {OBS_PCP_COMBINE_INPUT_DIR}/{OBS_PCP_COMBINE_INPUT_TEMPLATE} -field 'name="olr"; level="(*,*)";' -OBS_PCP_COMBINE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean +OBS_PCP_COMBINE_INPUT_DIR = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean OBS_PCP_COMBINE_INPUT_TEMPLATE = ERA_OLR_daily_mean_*{valid?fmt=%m%d}.nc -OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/mean_daily_annual_cycle +OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/mean_daily_annual_cycle OBS_PCP_COMBINE_OUTPUT_TEMPLATE = ERA_OLR_daily_annual_{valid?fmt=%m%d}.nc @@ -166,7 +166,7 @@ OBS_PCP_COMBINE_COMMAND = -derive mean {OBS_PCP_COMBINE_INPUT_DIR}/{OBS_PCP_COMB OBS_PCP_COMBINE_INPUT_DIR = /gpfs/fs1/collections/rda/data/ds627.0/ei.oper.an.pl OBS_PCP_COMBINE_INPUT_TEMPLATE = {valid?fmt=%Y%m}/ei.oper.an.pl.regn128uv.{valid?fmt=%Y%m%d}* -OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean +OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean OBS_PCP_COMBINE_OUTPUT_TEMPLATE = ERA_wind_daily_mean_{valid?fmt=%Y%m%d}.nc @@ -201,7 +201,7 @@ OBS_PCP_COMBINE_COMMAND = -add {OBS_PCP_COMBINE_INPUT_DIR}/{OBS_PCP_COMBINE_INPU OBS_PCP_COMBINE_INPUT_DIR = /glade/u/home/kalb/MJO OBS_PCP_COMBINE_INPUT_TEMPLATE = olr.1x.7920.nc -OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean +OBS_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean OBS_PCP_COMBINE_OUTPUT_TEMPLATE = ERA_OLR_daily_mean_{valid?fmt=%Y%m%d}.nc @@ -218,7 +218,7 @@ VALID_INCREMENT = 86400 LEAD_SEQ = 0 # Template of filenames to input to the user-script -USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/ERA/mean_daily_annual_cycle/ERA_OLR_daily_annual_{valid?fmt=%m%d}.nc,{INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/ERA/mean_daily_annual_cycle/ERA_wind_daily_annual_{valid?fmt=%m%d}.nc +USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/mean_daily_annual_cycle/ERA_OLR_daily_annual_{valid?fmt=%m%d}.nc,{INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/mean_daily_annual_cycle/ERA_wind_daily_annual_{valid?fmt=%m%d}.nc # Name of the file containing the listing of input files USER_SCRIPT_INPUT_TEMPLATE_LABELS = input_mean_daily_annual_infiles_olr,input_mean_daily_annual_infiles_wind @@ -235,7 +235,7 @@ USER_SCRIPT_COMMAND = echo Populated file list for Mean daily annual cycle Input USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE_PER_LEAD # Template of filenames to input to the user-script -USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean/ERA_OLR_daily_mean_{valid?fmt=%Y%m%d}.nc +USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean/ERA_OLR_daily_mean_{valid?fmt=%Y%m%d}.nc # Name of the file containing the listing of input files # The options are OBS_OLR_INPUT, OBS_U850_INPUT, OBS_U200_INPUT, FCST_OLR_INPUT, FCST_U850_INPUT, and FCST_U200_INPUT @@ -243,7 +243,7 @@ USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_obsE USER_SCRIPT_INPUT_TEMPLATE_LABELS = input_daily_mean_infiles # Command to run the user script with input configuration file -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py 'METPLUS_FILELIST_INPUT_MEAN_DAILY_ANNUAL_INFILES_OLR' 'olr' 'olr_NA_mean' '{OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly' 'ERA_OLR_anom' +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py 'METPLUS_FILELIST_INPUT_MEAN_DAILY_ANNUAL_INFILES_OLR' 'olr' 'olr_NA_mean' '{OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly' 'ERA_OLR_anom' # Configurations to create anomalies for U850 @@ -253,7 +253,7 @@ USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserS USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE_PER_LEAD # Template of filenames to input to the user-script -USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean/ERA_wind_daily_mean_{valid?fmt=%Y%m%d}.nc +USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean/ERA_wind_daily_mean_{valid?fmt=%Y%m%d}.nc # Name of the file containing the listing of input files # The options are OBS_OLR_INPUT, OBS_U850_INPUT, OBS_U200_INPUT, FCST_OLR_INPUT, FCST_U850_INPUT, and FCST_U200_INPUT @@ -261,7 +261,7 @@ USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_obsE USER_SCRIPT_INPUT_TEMPLATE_LABELS = input_daily_mean_infiles # Command to run the user script with input configuration file -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py 'METPLUS_FILELIST_INPUT_MEAN_DAILY_ANNUAL_INFILES_WIND' 'U_P850_mean' 'U_P850_mean' '{OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly' 'ERA_U850_anom' +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py 'METPLUS_FILELIST_INPUT_MEAN_DAILY_ANNUAL_INFILES_WIND' 'U_P850_mean' 'U_P850_mean' '{OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly' 'ERA_U850_anom' # Configurations to create anomalies for U200 @@ -271,7 +271,7 @@ USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserS USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE_PER_LEAD # Template of filenames to input to the user-script -USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean/ERA_wind_daily_mean_{valid?fmt=%Y%m%d}.nc +USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/daily_mean/ERA_wind_daily_mean_{valid?fmt=%Y%m%d}.nc # Name of the file containing the listing of input files # The options are OBS_OLR_INPUT, OBS_U850_INPUT, OBS_U200_INPUT, FCST_OLR_INPUT, FCST_U850_INPUT, and FCST_U200_INPUT @@ -279,7 +279,7 @@ USER_SCRIPT_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/s2s/UserScript_obsE USER_SCRIPT_INPUT_TEMPLATE_LABELS = input_daily_mean_infiles # Command to run the user script with input configuration file -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py 'METPLUS_FILELIST_INPUT_MEAN_DAILY_ANNUAL_INFILES_WIND' 'U_P200_mean' 'U_P200_mean' '{OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly' 'ERA_U200_anom' +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py 'METPLUS_FILELIST_INPUT_MEAN_DAILY_ANNUAL_INFILES_WIND' 'U_P200_mean' 'U_P200_mean' '{OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly' 'ERA_U200_anom' # Configurations for regrid_data_plane: Regrid OLR to -15 to 15 latitude @@ -301,8 +301,8 @@ OBS_REGRID_DATA_PLANE_VAR1_LEVELS = "(*,*)" OBS_REGRID_DATA_PLANE_VAR1_OUTPUT_FIELD_NAME = OLR_anom # input and output data directories for each application in PROCESS_LIST -OBS_REGRID_DATA_PLANE_INPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly -OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Regrid +OBS_REGRID_DATA_PLANE_INPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly +OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Regrid # format of filenames # Input ERA Interim @@ -329,8 +329,8 @@ OBS_REGRID_DATA_PLANE_VAR1_LEVELS = "(*,*)" OBS_REGRID_DATA_PLANE_VAR1_OUTPUT_FIELD_NAME = U_P850_anom # input and output data directories for each application in PROCESS_LIST -OBS_REGRID_DATA_PLANE_INPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly -OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Regrid +OBS_REGRID_DATA_PLANE_INPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly +OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Regrid # format of filenames # Input ERA Interim @@ -357,8 +357,8 @@ OBS_REGRID_DATA_PLANE_VAR1_LEVELS = "(*,*)" OBS_REGRID_DATA_PLANE_VAR1_OUTPUT_FIELD_NAME = U_P200_anom # input and output data directories for each application in PROCESS_LIST -OBS_REGRID_DATA_PLANE_INPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly -OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Regrid +OBS_REGRID_DATA_PLANE_INPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Anomaly +OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Regrid # format of filenames # Input ERA Interim @@ -384,9 +384,9 @@ OBS_U850_VAR_NAME = U_P850_anom OBS_U200_VAR_NAME = U_P200_anom # EOF Filename -OLR_EOF_INPUT_TEXTFILE = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/EOF/rmm_olr_eofs.txt -U850_EOF_INPUT_TEXTFILE = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/EOF/rmm_u850_eofs.txt -U200_EOF_INPUT_TEXTFILE = {INPUT_BASE}/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/EOF/rmm_u200_eofs.txt +OLR_EOF_INPUT_TEXTFILE = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/EOF/rmm_olr_eofs.txt +U850_EOF_INPUT_TEXTFILE = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/EOF/rmm_u850_eofs.txt +U200_EOF_INPUT_TEXTFILE = {INPUT_BASE}/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/EOF/rmm_u200_eofs.txt # Normalization factors for RMM RMM_OLR_NORM = 15.11623 @@ -397,7 +397,7 @@ PC2_NORM = 8.40736449709697 # Output Directory for the plots # If not set, it this will default to {OUTPUT_BASE}/plots -RMM_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/plots +RMM_PLOT_OUTPUT_DIR = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/plots # EOF plot information EOF_PLOT_OUTPUT_NAME = RMM_EOFs @@ -425,7 +425,7 @@ OBS_TIMESERIES_PLOT_OUTPUT_FORMAT = png USER_SCRIPT_RUNTIME_FREQ = RUN_ONCE_PER_LEAD # Template of filenames to input to the user-script -USER_SCRIPT_INPUT_TEMPLATE = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Regrid/ERA_OLR_{valid?fmt=%Y%m%d}.nc,{OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Regrid/ERA_U850_{valid?fmt=%Y%m%d}.nc,{OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA/Regrid/ERA_U200_{valid?fmt=%Y%m%d}.nc +USER_SCRIPT_INPUT_TEMPLATE = {OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Regrid/ERA_OLR_{valid?fmt=%Y%m%d}.nc,{OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Regrid/ERA_U850_{valid?fmt=%Y%m%d}.nc,{OUTPUT_BASE}/s2s_mjo/UserScript_obsERA_obsOnly_RMM/ERA/Regrid/ERA_U200_{valid?fmt=%Y%m%d}.nc # Name of the file containing the listing of input files # The options are OBS_OLR_INPUT, OBS_U850_INPUT, OBS_U200_INPUT, FCST_OLR_INPUT, FCST_U850_INPUT, and FCST_U200_INPUT @@ -433,4 +433,4 @@ USER_SCRIPT_INPUT_TEMPLATE = {OUTPUT_BASE}/s2s/UserScript_obsERA_obsOnly_RMM/ERA USER_SCRIPT_INPUT_TEMPLATE_LABELS = OBS_OLR_INPUT,OBS_U850_INPUT, OBS_U200_INPUT # Command to run the user script with input configuration file -USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/RMM_driver.py +USER_SCRIPT_COMMAND = {METPLUS_BASE}/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/RMM_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/RMM_driver.py b/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/RMM_driver.py similarity index 100% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/RMM_driver.py rename to parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/RMM_driver.py diff --git a/parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py b/parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py similarity index 100% rename from parm/use_cases/model_applications/s2s/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py rename to parm/use_cases/model_applications/s2s_mjo/UserScript_obsERA_obsOnly_RMM/compute_harmonic_anomalies.py diff --git a/parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf b/parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf similarity index 88% rename from parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf rename to parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf index 03adfa304b..0506c7d588 100644 --- a/parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf +++ b/parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField.conf @@ -185,20 +185,20 @@ ENSEMBLE_STAT_OUTPUT_PREFIX = HRRRE_F{lead?fmt=%3H}_ADPSFC [dir] # Use case config directory -CONFIG_DIR={PARM_BASE}/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField +CONFIG_DIR={PARM_BASE}/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField # input and output directories for pb2nc -PB2NC_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/hrrr_ensemble_sfc/prepbufr -PB2NC_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField/rap +PB2NC_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/hrrr_ensemble_sfc/prepbufr +PB2NC_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField/rap # input directory for ensemble_stat -FCST_ENSEMBLE_STAT_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/hrrr_ensemble_sfc/fcst +FCST_ENSEMBLE_STAT_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/hrrr_ensemble_sfc/fcst # point observation input dir for ensemble_stat (can also set grid obs) OBS_ENSEMBLE_STAT_POINT_INPUT_DIR = {PB2NC_OUTPUT_DIR} # output directory for ensemble_stat -ENSEMBLE_STAT_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField/EnsembleStat +ENSEMBLE_STAT_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField/EnsembleStat [filename_templates] @@ -221,9 +221,9 @@ FCST_ENSEMBLE_STAT_INPUT_TEMPLATE = OBS_ENSEMBLE_STAT_POINT_INPUT_TEMPLATE = {PB2NC_OUTPUT_TEMPLATE} ENSEMBLE_STAT_VERIFICATION_MASK_TEMPLATE = - {INPUT_BASE}/model_applications/convection_allowing_models/mask/EAST.nc, - {INPUT_BASE}/model_applications/convection_allowing_models/mask/WEST.nc, - {INPUT_BASE}/model_applications/convection_allowing_models/mask/CONUS.nc, - {INPUT_BASE}/model_applications/convection_allowing_models/mask/LMV.nc + {INPUT_BASE}/model_applications/short_range/mask/EAST.nc, + {INPUT_BASE}/model_applications/short_range/mask/WEST.nc, + {INPUT_BASE}/model_applications/short_range/mask/CONUS.nc, + {INPUT_BASE}/model_applications/short_range/mask/LMV.nc ENSEMBLE_STAT_OUTPUT_TEMPLATE = {init?fmt=%Y%m%d%H%M} diff --git a/parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField/obs_error_table_V8.0.txt b/parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField/obs_error_table_V8.0.txt similarity index 100% rename from parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField/obs_error_table_V8.0.txt rename to parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRRE_obsHRRRE_Sfc_MultiField/obs_error_table_V8.0.txt diff --git a/parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf b/parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf similarity index 95% rename from parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf rename to parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf index 22e00738e4..732e9b8997 100644 --- a/parm/use_cases/model_applications/convection_allowing_models/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf +++ b/parm/use_cases/model_applications/short_range/EnsembleStat_fcstHRRR_fcstOnly_SurrogateSevere.conf @@ -17,10 +17,10 @@ FCST_PCP_COMBINE_RUN = True FCST_PCP_COMBINE_METHOD = DERIVE FCST_PCP_COMBINE_STAT_LIST = MAX -FCST_PCP_COMBINE_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/surrogate_severe_calc +FCST_PCP_COMBINE_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/surrogate_severe_calc FCST_PCP_COMBINE_INPUT_TEMPLATE = {init?fmt=%Y%m%d}/hrrr_ncep_{init?fmt=%Y%m%d%H}f{lead?fmt=%HHH}.grib2 -FCST_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/convection_allowing_models/surrogate_severe_calc +FCST_PCP_COMBINE_OUTPUT_DIR = {OUTPUT_BASE}/short_range/surrogate_severe_calc FCST_PCP_COMBINE_OUTPUT_TEMPLATE = {init?fmt=%Y%m%d}/hrrr_ncep_{init?fmt=%Y%m%d%H}f{lead?fmt=%HHH}.nc diff --git a/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf b/parm/use_cases/model_applications/short_range/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf similarity index 82% rename from parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf rename to parm/use_cases/model_applications/short_range/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf index aab5494da8..1413acf396 100644 --- a/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf +++ b/parm/use_cases/model_applications/short_range/GridStat_fcstFV3_obsGOES_BrightnessTempDmap.conf @@ -48,11 +48,11 @@ GRID_STAT_NC_PAIRS_FLAG_DISTANCE_MAP = TRUE [dir] # Input and Output Diretory of the object data -FCST_GRID_STAT_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/brightness_temperature -OBS_GRID_STAT_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/brightness_temperature +FCST_GRID_STAT_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/brightness_temperature +OBS_GRID_STAT_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/brightness_temperature #Grid Stat output data location -GRID_STAT_OUTPUT_DIR = {OUTPUT_BASE}/convection_allowing_models/brightness_temperature/grid_stat +GRID_STAT_OUTPUT_DIR = {OUTPUT_BASE}/short_range/brightness_temperature/grid_stat [filename_templates] diff --git a/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf b/parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf similarity index 92% rename from parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf rename to parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf index 27aff82488..c72fffc792 100644 --- a/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf +++ b/parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevere.conf @@ -92,11 +92,11 @@ GRID_STAT_NC_PAIRS_FLAG_APPLY_MASK = FALSE [dir] # input and output data directories for each application in PROCESS_LIST -FCST_GRID_STAT_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/surrogate_severe_prac_perfect +FCST_GRID_STAT_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/surrogate_severe_prac_perfect OBS_GRID_STAT_INPUT_DIR = {FCST_GRID_STAT_INPUT_DIR} -GRID_STAT_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/convection_allowing_models/surrogate_severe_prac_perfect/grid_stat +GRID_STAT_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/short_range/surrogate_severe_prac_perfect/grid_stat [filename_templates] # format of filenames diff --git a/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf b/parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf similarity index 92% rename from parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf rename to parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf index c066d23743..b4aba49ff1 100644 --- a/parm/use_cases/model_applications/convection_allowing_models/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf +++ b/parm/use_cases/model_applications/short_range/GridStat_fcstHRRR_obsPracPerfect_SurrogateSevereProb.conf @@ -97,11 +97,11 @@ GRID_STAT_NC_PAIRS_FLAG_APPLY_MASK = FALSE [dir] # input and output data directories for each application in PROCESS_LIST -FCST_GRID_STAT_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/surrogate_severe_prac_perfect +FCST_GRID_STAT_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/surrogate_severe_prac_perfect OBS_GRID_STAT_INPUT_DIR = {FCST_GRID_STAT_INPUT_DIR} -GRID_STAT_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/convection_allowing_models/surrogate_severe_prac_perfect/grid_stat/prob +GRID_STAT_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/short_range/surrogate_severe_prac_perfect/grid_stat/prob [filename_templates] # format of filenames diff --git a/parm/use_cases/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf b/parm/use_cases/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf similarity index 73% rename from parm/use_cases/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf rename to parm/use_cases/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf index ba81602a7e..0874966bba 100644 --- a/parm/use_cases/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf +++ b/parm/use_cases/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp.conf @@ -14,7 +14,7 @@ LOOP_ORDER = processes MET_DB_LOAD_RUNTIME_FREQ = RUN_ONCE -MET_DATA_DB_DIR = {METPLUS_BASE}/../METdatadb +MET_DATA_DB_DIR = {METPLUS_BASE}/../METdataio # XML file with settings for MET_DB_LOAD_XML_FILE = {PARM_BASE}/use_cases/met_tool_wrapper/METdbLoad/METdbLoadConfig.xml @@ -43,4 +43,4 @@ MET_DB_LOAD_MV_LOAD_MTD = false MET_DB_LOAD_MV_LOAD_MPR = false # Location of input files -MET_DB_LOAD_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp/grid_stat,{INPUT_BASE}/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp/grid_stat_obj,{INPUT_BASE}/model_applications/convection_allowing_models/METdbLoad_fcstFV3_obsGoes_BrightnessTemp/mode +MET_DB_LOAD_INPUT_TEMPLATE = {INPUT_BASE}/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp/grid_stat,{INPUT_BASE}/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp/grid_stat_obj,{INPUT_BASE}/model_applications/short_range/METdbLoad_fcstFV3_obsGoes_BrightnessTemp/mode diff --git a/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp.conf b/parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp.conf similarity index 83% rename from parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp.conf rename to parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp.conf index a9f02d47d8..7da3455855 100644 --- a/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp.conf +++ b/parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp.conf @@ -70,7 +70,7 @@ OBS_VAR1_NAME = channel_13_brightness_temperature OBS_VAR1_LEVELS = "(*,*)" OBS_VAR1_OPTIONS = file_type = NETCDF_MET; -#CONFIG_DIR={PARM_BASE}/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp +#CONFIG_DIR={PARM_BASE}/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp MODE_CONFIG_FILE = {PARM_BASE}/met_config/MODEConfig_wrapped MODE_REGRID_TO_GRID = NONE @@ -78,13 +78,13 @@ MODE_OUTPUT_PREFIX = FV3_core_{instance} [dir] # Directory for FV3 data -FCST_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/brightness_temperature +FCST_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/brightness_temperature # Directory of the GOES obs -OBS_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/brightness_temperature +OBS_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/brightness_temperature # Output Data Location -MODE_OUTPUT_DIR = {OUTPUT_BASE}/convection_allowing_models/brightness_temperature +MODE_OUTPUT_DIR = {OUTPUT_BASE}/short_range/brightness_temperature [filename_templates] # Forecast Filename Template diff --git a/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp/ci_overrides.conf b/parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp/ci_overrides.conf similarity index 100% rename from parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTemp/ci_overrides.conf rename to parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTemp/ci_overrides.conf diff --git a/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf b/parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf similarity index 86% rename from parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf rename to parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf index 9eb9200b19..19f84437c2 100644 --- a/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf +++ b/parm/use_cases/model_applications/short_range/MODE_fcstFV3_obsGOES_BrightnessTempObjs.conf @@ -33,7 +33,7 @@ MODE_MERGE_THRESH = <=235 MODE_MERGE_FLAG = NONE -MODE_MASK_POLY = {INPUT_BASE}/model_applications/convection_allowing_models/brightness_temperature/CentUS.nc +MODE_MASK_POLY = {INPUT_BASE}/model_applications/short_range/brightness_temperature/CentUS.nc # Forecast Brightness Temperature Variable Information MODEL = FV3_core @@ -108,20 +108,20 @@ GRID_STAT_OUTPUT_PREFIX = FV3_core_{instance} [dir] # Directory for FV3 data -FCST_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/brightness_temperature +FCST_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/brightness_temperature # Directory of the GOES obs -OBS_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/brightness_temperature +OBS_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/brightness_temperature # MODE Output Data Location -MODE_OUTPUT_DIR = {OUTPUT_BASE}/convection_allowing_models/brightness_temperature/mode +MODE_OUTPUT_DIR = {OUTPUT_BASE}/short_range/brightness_temperature/mode # Input and Output Diretory of the object data FCST_GRID_STAT_INPUT_DIR = {MODE_OUTPUT_DIR} OBS_GRID_STAT_INPUT_DIR = {FCST_GRID_STAT_INPUT_DIR} #Grid Stat output data location -GRID_STAT_OUTPUT_DIR = {OUTPUT_BASE}/convection_allowing_models/brightness_temperature/grid_stat_obj +GRID_STAT_OUTPUT_DIR = {OUTPUT_BASE}/short_range/brightness_temperature/grid_stat_obj [filename_templates] diff --git a/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf b/parm/use_cases/model_applications/short_range/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf similarity index 87% rename from parm/use_cases/model_applications/convection_allowing_models/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf rename to parm/use_cases/model_applications/short_range/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf index c236b9e6de..f7d9fabdf1 100644 --- a/parm/use_cases/model_applications/convection_allowing_models/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf +++ b/parm/use_cases/model_applications/short_range/MODE_fcstHRRR_obsMRMS_Hail_GRIB2.conf @@ -66,7 +66,7 @@ OBS_VAR1_NAME = MESHMax60min OBS_VAR1_LEVELS = Z500 OBS_VAR1_OPTIONS = convert(x) = MM_to_IN(x); -#CONFIG_DIR={PARM_BASE}/use_cases/model_applications/convection_allowing_models/MODE_fcstHRRR_obsMRMS_Hail_GRIB2 +#CONFIG_DIR={PARM_BASE}/use_cases/model_applications/short_range/MODE_fcstHRRR_obsMRMS_Hail_GRIB2 #MODE_CONFIG_FILE = {CONFIG_DIR}/MODEConfig_hailcast MODE_CONFIG_FILE = {PARM_BASE}/met_config/MODEConfig_wrapped @@ -77,10 +77,10 @@ MODE_REGRID_WIDTH = 2 [dir] # Directory for HRRR data -FCST_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/hrrr_esrl +FCST_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/hrrr_esrl # Directory of the MRMS obs -OBS_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/hrrr_esrl +OBS_MODE_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/hrrr_esrl # Output Data MODE_OUTPUT_DIR = {OUTPUT_BASE}/hailtest diff --git a/parm/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf b/parm/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf similarity index 87% rename from parm/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf rename to parm/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf index b125e9ba99..affb8768f1 100644 --- a/parm/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf +++ b/parm/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect.conf @@ -142,24 +142,24 @@ REGRID_DATA_PLANE_GAUSSIAN_RADIUS = 120 [dir] # Input/Output directories can be left empty if the corresponding template contains the full path to the files -ASCII2NC_INPUT_DIR = {INPUT_BASE}/model_applications/convection_allowing_models/practically_perfect -POINT2GRID_INPUT_DIR = {OUTPUT_BASE}/model_applications/convection_allowing_models/practically_perfect -POINT2GRID_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/convection_allowing_models/practically_perfect +ASCII2NC_INPUT_DIR = {INPUT_BASE}/model_applications/short_range/practically_perfect +POINT2GRID_INPUT_DIR = {OUTPUT_BASE}/model_applications/short_range/practically_perfect +POINT2GRID_OUTPUT_DIR = {OUTPUT_BASE}/model_applications/short_range/practically_perfect OBS_REGRID_DATA_PLANE_INPUT_DIR = {POINT2GRID_OUTPUT_DIR} OBS_REGRID_DATA_PLANE_OUTPUT_DIR = {POINT2GRID_OUTPUT_DIR} -CONFIG_DIR = {PARM_BASE}/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect +CONFIG_DIR = {PARM_BASE}/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect # End of [dir] section and start of [filename_templates] section [filename_templates] # Template to look for input to ASCII2NC input storm reports ASCII2NC_INPUT_TEMPLATE = "{CONFIG_DIR}/read_ascii_storm.py {ASCII2NC_INPUT_DIR}/200205_rpts_filtered.csv" -ASCII2NC_OUTPUT_TEMPLATE = {OUTPUT_BASE}/model_applications/convection_allowing_models/practically_perfect/StormReps.{init?fmt=%Y%m%d%H}.nc +ASCII2NC_OUTPUT_TEMPLATE = {OUTPUT_BASE}/model_applications/short_range/practically_perfect/StormReps.{init?fmt=%Y%m%d%H}.nc # Templates to use for input to Point2Grid from the output of ASCII2NC and output from Point2Grid -POINT2GRID_INPUT_TEMPLATE = {OUTPUT_BASE}/model_applications/convection_allowing_models/practically_perfect/StormReps.{init?fmt=%Y%m%d%H}.nc -POINT2GRID_OUTPUT_TEMPLATE = {OUTPUT_BASE}/model_applications/convection_allowing_models/practically_perfect/StormReps_211.{init?fmt=%Y%m%d%H}.nc +POINT2GRID_INPUT_TEMPLATE = {OUTPUT_BASE}/model_applications/short_range/practically_perfect/StormReps.{init?fmt=%Y%m%d%H}.nc +POINT2GRID_OUTPUT_TEMPLATE = {OUTPUT_BASE}/model_applications/short_range/practically_perfect/StormReps_211.{init?fmt=%Y%m%d%H}.nc #Regrid data plane templates OBS_REGRID_DATA_PLANE_INPUT_TEMPLATE = StormReps_211.{init?fmt=%Y%m%d%H}.nc diff --git a/parm/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect/read_ascii_storm.py b/parm/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect/read_ascii_storm.py similarity index 100% rename from parm/use_cases/model_applications/convection_allowing_models/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect/read_ascii_storm.py rename to parm/use_cases/model_applications/short_range/Point2Grid_obsLSR_ObsOnly_PracticallyPerfect/read_ascii_storm.py