From 4d9e7294c47b5bd4d190b97944529bf69e804658 Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Wed, 4 Mar 2026 18:53:50 +0100 Subject: [PATCH 1/5] Retire eyring13jgr recipe --- .../eyring13jgr/eyring13jgr_fig12.ncl | 0 .../legacy_recipes}/recipe_eyring13jgr_12.yml | 0 .../recipes/{ => legacy}/recipe_eyring13jgr.rst | 14 ++++++++++---- doc/sphinx/source/recipes/legacy_recipe_list.rst | 1 + esmvaltool/utils/batch-jobs/generate.py | 3 --- esmvaltool/utils/testing/regression/recipes.rc | 1 - 6 files changed, 11 insertions(+), 8 deletions(-) rename {esmvaltool/diag_scripts => archive/legacy_diag_scripts}/eyring13jgr/eyring13jgr_fig12.ncl (100%) rename {esmvaltool/recipes => archive/legacy_recipes}/recipe_eyring13jgr_12.yml (100%) rename doc/sphinx/source/recipes/{ => legacy}/recipe_eyring13jgr.rst (79%) diff --git a/esmvaltool/diag_scripts/eyring13jgr/eyring13jgr_fig12.ncl b/archive/legacy_diag_scripts/eyring13jgr/eyring13jgr_fig12.ncl similarity index 100% rename from esmvaltool/diag_scripts/eyring13jgr/eyring13jgr_fig12.ncl rename to archive/legacy_diag_scripts/eyring13jgr/eyring13jgr_fig12.ncl diff --git a/esmvaltool/recipes/recipe_eyring13jgr_12.yml b/archive/legacy_recipes/recipe_eyring13jgr_12.yml similarity index 100% rename from esmvaltool/recipes/recipe_eyring13jgr_12.yml rename to archive/legacy_recipes/recipe_eyring13jgr_12.yml diff --git a/doc/sphinx/source/recipes/recipe_eyring13jgr.rst b/doc/sphinx/source/recipes/legacy/recipe_eyring13jgr.rst similarity index 79% rename from doc/sphinx/source/recipes/recipe_eyring13jgr.rst rename to doc/sphinx/source/recipes/legacy/recipe_eyring13jgr.rst index 19927f405c..a19069815d 100644 --- a/doc/sphinx/source/recipes/recipe_eyring13jgr.rst +++ b/doc/sphinx/source/recipes/legacy/recipe_eyring13jgr.rst @@ -1,7 +1,13 @@ .. _recipe_eyring13jgr: -Ozone and associated climate impacts -==================================== +Legacy recipe: Ozone and associated climate impacts +=================================================== + +.. note:: + + This recipe has been retired and moved to the folder "archive". This recipe + is only included for documentation purposes and not maintained any more. The + last known ESMValTool version supporting this recipe is version 2.14.0. Overview -------- @@ -17,11 +23,11 @@ The following plots are reproduced: Available recipes and diagnostics --------------------------------- -Recipes are stored in esmvaltool/recipes/ +Recipes are stored in archive/legacy_recipes * recipe_eyring13jgr_12.yml -Diagnostics are stored in esmvaltool/diag_scripts/eyring13jgr/ +Diagnostics are stored in archive/legacy_diag_scripts/eyring13jgr/ * eyring13jgr_fig12.ncl diff --git a/doc/sphinx/source/recipes/legacy_recipe_list.rst b/doc/sphinx/source/recipes/legacy_recipe_list.rst index f09c5774fa..7521cb81f2 100644 --- a/doc/sphinx/source/recipes/legacy_recipe_list.rst +++ b/doc/sphinx/source/recipes/legacy_recipe_list.rst @@ -10,6 +10,7 @@ require a legacy version of ESMValTool to run. .. toctree:: :maxdepth: 1 + legacy/recipe_eyring13jgr legacy/recipe_psyplot legacy/recipe_rainfarm legacy/recipe_schlund20jgr diff --git a/esmvaltool/utils/batch-jobs/generate.py b/esmvaltool/utils/batch-jobs/generate.py index 326134faba..4b9cbdd8eb 100644 --- a/esmvaltool/utils/batch-jobs/generate.py +++ b/esmvaltool/utils/batch-jobs/generate.py @@ -101,9 +101,6 @@ "recipe_eyring06jgr": { "partition": "#SBATCH --partition=compute \n", }, - "recipe_eyring13jgr_12": { - "partition": "#SBATCH --partition=compute \n", - }, "recipe_flato13ipcc_figures_938_941_cmip6": { "partition": "#SBATCH --partition=compute \n", }, diff --git a/esmvaltool/utils/testing/regression/recipes.rc b/esmvaltool/utils/testing/regression/recipes.rc index 3549dc3a5a..0d0bbfb191 100644 --- a/esmvaltool/utils/testing/regression/recipes.rc +++ b/esmvaltool/utils/testing/regression/recipes.rc @@ -34,7 +34,6 @@ "recipe_extreme_events.yml", "recipe_extreme_index.yml", "recipe_eyring06jgr.yml", - "recipe_eyring13jgr_12.yml", "recipe_flato13ipcc.yml", "recipe_gier2020bg.yml", "recipe_heatwaves_coldwaves.yml", From 07ee93f82a96ef7ad0da0ff5aa5d94ff81dcb1a3 Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Wed, 4 Mar 2026 18:58:48 +0100 Subject: [PATCH 2/5] Retire eyring06 recipe --- .../eyring06jgr/eyring06jgr_fig01.ncl | 0 .../eyring06jgr/eyring06jgr_fig05a.ncl | 0 .../eyring06jgr/eyring06jgr_fig05b.ncl | 0 .../eyring06jgr/eyring06jgr_fig15.ncl | 0 .../legacy_recipes}/recipe_eyring06jgr.yml | 0 doc/sphinx/source/recipes/index.rst | 2 -- .../recipes/{ => legacy}/recipe_eyring06jgr.rst | 14 ++++++++++---- doc/sphinx/source/recipes/legacy_recipe_list.rst | 1 + esmvaltool/utils/batch-jobs/generate.py | 3 --- esmvaltool/utils/testing/regression/recipes.rc | 1 - 10 files changed, 11 insertions(+), 10 deletions(-) rename {esmvaltool/diag_scripts => archive/legacy_diag_scripts}/eyring06jgr/eyring06jgr_fig01.ncl (100%) rename {esmvaltool/diag_scripts => archive/legacy_diag_scripts}/eyring06jgr/eyring06jgr_fig05a.ncl (100%) rename {esmvaltool/diag_scripts => archive/legacy_diag_scripts}/eyring06jgr/eyring06jgr_fig05b.ncl (100%) rename {esmvaltool/diag_scripts => archive/legacy_diag_scripts}/eyring06jgr/eyring06jgr_fig15.ncl (100%) rename {esmvaltool/recipes => archive/legacy_recipes}/recipe_eyring06jgr.yml (100%) rename doc/sphinx/source/recipes/{ => legacy}/recipe_eyring06jgr.rst (85%) diff --git a/esmvaltool/diag_scripts/eyring06jgr/eyring06jgr_fig01.ncl b/archive/legacy_diag_scripts/eyring06jgr/eyring06jgr_fig01.ncl similarity index 100% rename from esmvaltool/diag_scripts/eyring06jgr/eyring06jgr_fig01.ncl rename to archive/legacy_diag_scripts/eyring06jgr/eyring06jgr_fig01.ncl diff --git a/esmvaltool/diag_scripts/eyring06jgr/eyring06jgr_fig05a.ncl b/archive/legacy_diag_scripts/eyring06jgr/eyring06jgr_fig05a.ncl similarity index 100% rename from esmvaltool/diag_scripts/eyring06jgr/eyring06jgr_fig05a.ncl rename to archive/legacy_diag_scripts/eyring06jgr/eyring06jgr_fig05a.ncl diff --git a/esmvaltool/diag_scripts/eyring06jgr/eyring06jgr_fig05b.ncl b/archive/legacy_diag_scripts/eyring06jgr/eyring06jgr_fig05b.ncl similarity index 100% rename from esmvaltool/diag_scripts/eyring06jgr/eyring06jgr_fig05b.ncl rename to archive/legacy_diag_scripts/eyring06jgr/eyring06jgr_fig05b.ncl diff --git a/esmvaltool/diag_scripts/eyring06jgr/eyring06jgr_fig15.ncl b/archive/legacy_diag_scripts/eyring06jgr/eyring06jgr_fig15.ncl similarity index 100% rename from esmvaltool/diag_scripts/eyring06jgr/eyring06jgr_fig15.ncl rename to archive/legacy_diag_scripts/eyring06jgr/eyring06jgr_fig15.ncl diff --git a/esmvaltool/recipes/recipe_eyring06jgr.yml b/archive/legacy_recipes/recipe_eyring06jgr.yml similarity index 100% rename from esmvaltool/recipes/recipe_eyring06jgr.yml rename to archive/legacy_recipes/recipe_eyring06jgr.yml diff --git a/doc/sphinx/source/recipes/index.rst b/doc/sphinx/source/recipes/index.rst index 4f43a4153a..6fd6fbf921 100644 --- a/doc/sphinx/source/recipes/index.rst +++ b/doc/sphinx/source/recipes/index.rst @@ -45,8 +45,6 @@ Atmosphere recipe_eady_growth_rate recipe_extreme_events recipe_extreme_index - recipe_eyring06jgr - recipe_eyring13jgr recipe_gier20bg recipe_heatwaves_coldwaves recipe_hyint diff --git a/doc/sphinx/source/recipes/recipe_eyring06jgr.rst b/doc/sphinx/source/recipes/legacy/recipe_eyring06jgr.rst similarity index 85% rename from doc/sphinx/source/recipes/recipe_eyring06jgr.rst rename to doc/sphinx/source/recipes/legacy/recipe_eyring06jgr.rst index fffd5d80d8..16846c8aab 100644 --- a/doc/sphinx/source/recipes/recipe_eyring06jgr.rst +++ b/doc/sphinx/source/recipes/legacy/recipe_eyring06jgr.rst @@ -1,7 +1,13 @@ .. _recipe_eyring06jgr: -Diagnostics of stratospheric dynamics and chemistry -=================================================== +Legacy recipe: Diagnostics of stratospheric dynamics and chemistry +================================================================== + +.. note:: + + This recipe has been retired and moved to the folder "archive". This recipe + is only included for documentation purposes and not maintained any more. The + last known ESMValTool version supporting this recipe is version 2.14.0. Overview -------- @@ -18,11 +24,11 @@ The following plots are reproduced: Available recipes and diagnostics --------------------------------- -Recipes are stored in esmvaltool/recipes/ +Recipes are stored in archive/legacy_recipes * recipe_eyring06jgr.yml -Diagnostics are stored in esmvaltool/diag_scripts/eyring06jgr/ +Diagnostics are stored in archive/legacy_diag_scripts/eyring06jgr/ * eyring06jgr_fig01.ncl * eyring06jgr_fig05a.ncl diff --git a/doc/sphinx/source/recipes/legacy_recipe_list.rst b/doc/sphinx/source/recipes/legacy_recipe_list.rst index 7521cb81f2..957519c49e 100644 --- a/doc/sphinx/source/recipes/legacy_recipe_list.rst +++ b/doc/sphinx/source/recipes/legacy_recipe_list.rst @@ -10,6 +10,7 @@ require a legacy version of ESMValTool to run. .. toctree:: :maxdepth: 1 + legacy/recipe_eyring06jgr legacy/recipe_eyring13jgr legacy/recipe_psyplot legacy/recipe_rainfarm diff --git a/esmvaltool/utils/batch-jobs/generate.py b/esmvaltool/utils/batch-jobs/generate.py index 4b9cbdd8eb..16c8915730 100644 --- a/esmvaltool/utils/batch-jobs/generate.py +++ b/esmvaltool/utils/batch-jobs/generate.py @@ -98,9 +98,6 @@ "recipe_extreme_index": { "partition": "#SBATCH --partition=compute \n", }, - "recipe_eyring06jgr": { - "partition": "#SBATCH --partition=compute \n", - }, "recipe_flato13ipcc_figures_938_941_cmip6": { "partition": "#SBATCH --partition=compute \n", }, diff --git a/esmvaltool/utils/testing/regression/recipes.rc b/esmvaltool/utils/testing/regression/recipes.rc index 0d0bbfb191..189c2bc0d7 100644 --- a/esmvaltool/utils/testing/regression/recipes.rc +++ b/esmvaltool/utils/testing/regression/recipes.rc @@ -33,7 +33,6 @@ "recipe_ensclus.yml", "recipe_extreme_events.yml", "recipe_extreme_index.yml", - "recipe_eyring06jgr.yml", "recipe_flato13ipcc.yml", "recipe_gier2020bg.yml", "recipe_heatwaves_coldwaves.yml", From b00563bf0f83ef60a54803541b13e452becdefaf Mon Sep 17 00:00:00 2001 From: Manuel Schlund Date: Wed, 4 Mar 2026 19:08:12 +0100 Subject: [PATCH 3/5] Remove from generate.py script --- esmvaltool/utils/batch-jobs/generate.py | 1 - 1 file changed, 1 deletion(-) diff --git a/esmvaltool/utils/batch-jobs/generate.py b/esmvaltool/utils/batch-jobs/generate.py index 3fab337f28..111ed104fb 100644 --- a/esmvaltool/utils/batch-jobs/generate.py +++ b/esmvaltool/utils/batch-jobs/generate.py @@ -190,7 +190,6 @@ "recipe_bock20jgr_fig_8-10": 1, "recipe_daily_era5": 1, "recipe_easy_ipcc": 1, - "recipe_eyring13jgr_12": 1, "recipe_climate_change_hotspot": 1, "recipe_flato13ipcc_figure_96": 1, "recipe_flato13ipcc_figures_938_941_cmip3": 1, From e9b2522f7c79a3233c5ecd99ab76a66f799dba64 Mon Sep 17 00:00:00 2001 From: Manuel Schlund <32543114+schlunma@users.noreply.github.com> Date: Wed, 4 Mar 2026 19:09:17 +0100 Subject: [PATCH 4/5] Update doc/sphinx/source/recipes/legacy/recipe_eyring06jgr.rst Co-authored-by: Bettina Gier --- doc/sphinx/source/recipes/legacy/recipe_eyring06jgr.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx/source/recipes/legacy/recipe_eyring06jgr.rst b/doc/sphinx/source/recipes/legacy/recipe_eyring06jgr.rst index 16846c8aab..d123e43d4f 100644 --- a/doc/sphinx/source/recipes/legacy/recipe_eyring06jgr.rst +++ b/doc/sphinx/source/recipes/legacy/recipe_eyring06jgr.rst @@ -7,7 +7,7 @@ Legacy recipe: Diagnostics of stratospheric dynamics and chemistry This recipe has been retired and moved to the folder "archive". This recipe is only included for documentation purposes and not maintained any more. The - last known ESMValTool version supporting this recipe is version 2.14.0. + last known ESMValTool version supporting this recipe is version 2.13.0. Overview -------- From c6b1607d517967e00cb3bdfc3fd280c70ae582a5 Mon Sep 17 00:00:00 2001 From: Manuel Schlund <32543114+schlunma@users.noreply.github.com> Date: Wed, 4 Mar 2026 19:09:24 +0100 Subject: [PATCH 5/5] Update doc/sphinx/source/recipes/legacy/recipe_eyring13jgr.rst Co-authored-by: Bettina Gier --- doc/sphinx/source/recipes/legacy/recipe_eyring13jgr.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx/source/recipes/legacy/recipe_eyring13jgr.rst b/doc/sphinx/source/recipes/legacy/recipe_eyring13jgr.rst index a19069815d..aeb4847514 100644 --- a/doc/sphinx/source/recipes/legacy/recipe_eyring13jgr.rst +++ b/doc/sphinx/source/recipes/legacy/recipe_eyring13jgr.rst @@ -7,7 +7,7 @@ Legacy recipe: Ozone and associated climate impacts This recipe has been retired and moved to the folder "archive". This recipe is only included for documentation purposes and not maintained any more. The - last known ESMValTool version supporting this recipe is version 2.14.0. + last known ESMValTool version supporting this recipe is version 2.13.0. Overview --------