Skip to content

Commit

Permalink
#3724: Replace single quotes with double quotes
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisbillowsMO committed Jan 10, 2025
1 parent 79ac7af commit 7d7f19c
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 47 deletions.
22 changes: 11 additions & 11 deletions esmvaltool/utils/recipe_test_workflow/flow.cylc
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!jinja2
{{ assert(SITE != "", "SITE must be set to something other than an empty string") }}

{% set SITE_RECIPES_FILE = 'site/' ~ SITE ~ '-recipes.cylc' %}
{% set SITE_RECIPES_FILE = "site/" ~ SITE ~ "-recipes.cylc" %}
{% from SITE_RECIPES_FILE import FAST_RECIPES, MEDIUM_RECIPES %}

{% set ERROR_MSG =
"is undefined and must be set in '" ~ SITE_RECIPES_FILE ~ ". The 'How to "
"is undefined and must be set in '" ~ SITE_RECIPES_FILE ~ "'. The 'How to "
"add a recipe to the RTW' documentation provides more information."
%}
{{ assert(FAST_RECIPES is defined, "FAST_RECIPES " ~ ERROR_MSG)}}
Expand All @@ -15,8 +15,8 @@
UTC mode = True

[task parameters]
fast = {{ FAST_RECIPES | map(attribute='recipe_path') | join(', ') }}
medium = {{ MEDIUM_RECIPES | map(attribute='recipe_path') | join(', ') }}
fast = {{ FAST_RECIPES | map(attribute="recipe_path") | join(", ") }}
medium = {{ MEDIUM_RECIPES | map(attribute="recipe_path") | join(", ") }}

[scheduling]
initial cycle point = now
Expand Down Expand Up @@ -80,25 +80,25 @@
# Bash variable substitution below replaces `--` with `/` to obtain path to
# recipe.
{% for RECIPE in FAST_RECIPES %}
[[process<fast={{ RECIPE['recipe_path'] }}>]]
[[process<fast={{ RECIPE["recipe_path"] }}>]]
inherit = None, COMPUTE
execution time limit = {{ RECIPE['max_time'] }}
execution time limit = {{ RECIPE["max_time"] }}
[[[environment]]]
ROSE_TASK_APP = process
RECIPE_PATH = "${CYLC_TASK_PARAM_fast//--//}.yml"
[[[directives]]]
--mem = {{ RECIPE['max_memory'] }}
--mem = {{ RECIPE["max_memory"] }}
{% endfor %}

{% for RECIPE in MEDIUM_RECIPES %}
[[process<medium={{ RECIPE['recipe_path'] }}>]]
[[process<medium={{ RECIPE["recipe_path"] }}>]]
inherit = None, COMPUTE
execution time limit = {{ RECIPE['max_time'] }}
execution time limit = {{ RECIPE["max_time"] }}
[[[environment]]]
ROSE_TASK_APP = process
RECIPE_PATH = "${CYLC_TASK_PARAM_medium//--//}.yml"
[[[directives]]]
--mem = {{ RECIPE['max_memory'] }}
--mem = {{ RECIPE["max_memory"] }}
{% endfor %}

[[COMPARE]]
Expand Down Expand Up @@ -127,4 +127,4 @@
COMPARISON_OUTPUT_DIR=${OUTPUT_DIR}/${RECIPE_NAME}*
KGO_DIR=${KGO_ROOT_PATH}/${RECIPE_NAME}*

{% include 'site/' ~ SITE ~ '.cylc' %}
{% include "site/" ~ SITE ~ ".cylc" %}
72 changes: 36 additions & 36 deletions esmvaltool/utils/recipe_test_workflow/site/metoffice-recipes.cylc
Original file line number Diff line number Diff line change
Expand Up @@ -13,52 +13,52 @@
{% set FAST_RECIPES =
[
{
'recipe_path': 'recipe_radiation_budget',
'actual': 'na',
'max_time': 'PT2M',
'max_memory': '2G',
"recipe_path": "recipe_radiation_budget",
"actual": "na",
"max_time": "PT2M",
"max_memory": "2G",
},
{
'recipe_path': 'recipe_albedolandcover',
'actual': '0m31s, 2.5 GB on 2024-04-08',
'max_time': 'PT2M',
'max_memory': '3G',
"recipe_path": "recipe_albedolandcover",
"actual": "0m31s, 2.5 GB on 2024-04-08",
"max_time": "PT2M",
"max_memory": "3G",
},
{
'recipe_path': 'recipe_heatwaves_coldwaves',
'actual': 'na',
'max_time': 'PT2M',
'max_memory': '2G',
"recipe_path": "recipe_heatwaves_coldwaves",
"actual": "na",
"max_time": "PT2M",
"max_memory": "2G",
},
{
'recipe_path': 'recipe_autoassess_landsurface_soilmoisture',
'actual': '0m36s, 2.8 GB on 2024-03-29',
'max_time': 'PT2M',
'max_memory': '3G',
"recipe_path": "recipe_autoassess_landsurface_soilmoisture",
"actual": "0m36s, 2.8 GB on 2024-03-29",
"max_time": "PT2M",
"max_memory": "3G",
},
{
'recipe_path': 'recipe_consecdrydays',
'actual': 'na',
'max_time': 'PT2M',
'max_memory': '2G',
"recipe_path": "recipe_consecdrydays",
"actual": "na",
"max_time": "PT2M",
"max_memory": "2G",
},
{
'recipe_path': 'examples--recipe_python',
'actual': 'na',
'max_time': 'PT2M',
'max_memory': '2G',
"recipe_path": "examples--recipe_python",
"actual": "na",
"max_time": "PT2M",
"max_memory": "2G",
},
{
'recipe_path': 'recipe_ocean_amoc',
'actual': '1m47s, 3.4 GB on 2024-06-17',
'max_time': 'PT3M',
'max_memory': '4G',
"recipe_path": "recipe_ocean_amoc",
"actual": "1m47s, 3.4 GB on 2024-06-17",
"max_time": "PT3M",
"max_memory": "4G",
},
{
'recipe_path': 'recipe_ocean_multimap',
'actual': '6m52s, 2.5 GB on 2024-05-28',
'max_time': 'PT8M',
'max_memory': '3G',
"recipe_path": "recipe_ocean_multimap",
"actual": "6m52s, 2.5 GB on 2024-05-28",
"max_time": "PT8M",
"max_memory": "3G",
},
]
%}
Expand All @@ -67,10 +67,10 @@
{% set MEDIUM_RECIPES =
[
{
'recipe_path': 'recipe_ensclus',
'actual': '2m10s, 2.4 GB on 2024-03-29',
'max_time': 'PT4M',
'max_memory': '3G',
"recipe_path": "recipe_ensclus",
"actual": "2m10s, 2.4 GB on 2024-03-29",
"max_time": "PT4M",
"max_memory": "3G",
},
]
%}

0 comments on commit 7d7f19c

Please sign in to comment.