From f07147bef1824d495a5b8db6f74bd22d68156c7f Mon Sep 17 00:00:00 2001 From: Emma Hogan Date: Tue, 25 Jun 2024 15:11:03 +0100 Subject: [PATCH] #3664: Add the `recipe_ocean_amoc.yml` recipe to the RTW --- esmvaltool/utils/recipe_test_workflow/doc/source/common.txt | 1 + .../recipe_test_workflow/doc/source/tested_recipes.rst | 1 + .../recipe_test_workflow/recipe_test_workflow/flow.cylc | 3 ++- .../recipe_test_workflow/site/metoffice.cylc | 6 ++++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/esmvaltool/utils/recipe_test_workflow/doc/source/common.txt b/esmvaltool/utils/recipe_test_workflow/doc/source/common.txt index 2d147c7925..f52ada3b5a 100644 --- a/esmvaltool/utils/recipe_test_workflow/doc/source/common.txt +++ b/esmvaltool/utils/recipe_test_workflow/doc/source/common.txt @@ -26,6 +26,7 @@ .. _Heatwaves coldwaves: https://docs.esmvaltool.org/en/latest/recipes/recipe_heatwaves_coldwaves.html .. _Landcover - Albedo: https://docs.esmvaltool.org/en/latest/recipes/recipe_albedolandcover.html#landcover-albedo .. _new ESMValTool issue: https://github.com/ESMValGroup/ESMValTool/issues/new +.. _Ocean Atlantic Meridional Overturning Circulation (AMOC): https://docs.esmvaltool.org/en/latest/recipes/recipe_oceans.html#recipe-ocean-amoc-yml .. _Ocean multimap: https://docs.esmvaltool.org/en/latest/recipes/recipe_oceans.html#recipe-ocean-multimap-yml .. _Radiation budget: https://docs.esmvaltool.org/en/latest/recipes/recipe_radiation_budget.html .. _Rose Documentation: https://metomi.github.io/rose/doc/html/index.html diff --git a/esmvaltool/utils/recipe_test_workflow/doc/source/tested_recipes.rst b/esmvaltool/utils/recipe_test_workflow/doc/source/tested_recipes.rst index f163da3dd2..d9e765190c 100644 --- a/esmvaltool/utils/recipe_test_workflow/doc/source/tested_recipes.rst +++ b/esmvaltool/utils/recipe_test_workflow/doc/source/tested_recipes.rst @@ -12,5 +12,6 @@ The following currently tested recipes are available in the |RTW|: * `Examples python`_ * `Heatwaves coldwaves`_ * `Landcover - Albedo`_ +* `Ocean Atlantic Meridional Overturning Circulation (AMOC)`_ * `Ocean multimap`_ * `Radiation budget`_ diff --git a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/flow.cylc b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/flow.cylc index a4b24333b4..2fb4857db7 100644 --- a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/flow.cylc +++ b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/flow.cylc @@ -12,7 +12,8 @@ recipe_autoassess_landsurface_soilmoisture, \ recipe_consecdrydays, \ examples--recipe_python, \ - recipe_ocean_multimap + recipe_ocean_multimap, \ + recipe_ocean_amoc medium = recipe_ensclus # Should be in fast: is in medium temporarily to # avoid empty variable. diff --git a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/site/metoffice.cylc b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/site/metoffice.cylc index 8dedf3ba0b..6de38b063d 100644 --- a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/site/metoffice.cylc +++ b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/site/metoffice.cylc @@ -41,6 +41,12 @@ [[[directives]]] --mem = 3G + [[process]] + # Actual: 1m47s, 3.4 GB on 2024-06-17. + execution time limit = PT3M + [[[directives]]] + --mem = 4G + [[process]] # Actual: 6m52s, 2.5 GB on 2024-05-28. execution time limit = PT8M