Skip to content

Commit 4625642

Browse files
jfrost-mojfrost-mo
committed
Add subarea variables to include files
This prevents the workflow failing due to missing recipe variables.
1 parent 54f338c commit 4625642

15 files changed

+250
-1
lines changed

‎cset-workflow/includes/aoa_diag.cylc‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,18 @@
1212

1313
[[[environment]]]
1414
CSET_RECIPE_NAME = "ageofair.yaml"
15-
CSET_ADDOPTS = "--AOA_PLEV={{plev}} --AOA_CYCLIC={{AOA_CYCLIC}} --MODEL_NAME='{{model["name"]}}'"
15+
CSET_ADDOPTS = """
16+
--AOA_PLEV='{{plev}}'
17+
--AOA_CYCLIC='{{AOA_CYCLIC}}'
18+
--MODEL_NAME='{{model["name"]}}'
19+
{% if SELECT_SUBAREA %}
20+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
21+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
22+
{% else %}
23+
--SUBAREA_TYPE='None'
24+
--SUBAREA_EXTENT='None'
25+
{% endif %}
26+
"""
1627
MODEL_IDENTIFIERS = {{model["id"]}}
1728
{% endfor %}
1829
{% endfor %}

‎cset-workflow/includes/basic_qq_plot.cylc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
--LEVELS_B='{{LEVELS_B}}'
1919
--COORD_LIST='{{COORDINATE_LIST}}'
2020
--ONE_TO_ONE='{{ONE_TO_ONE}}'
21+
{% if SELECT_SUBAREA %}
22+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
23+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
24+
{% else %}
25+
--SUBAREA_TYPE='None'
26+
--SUBAREA_EXTENT='None'
27+
{% endif %}
2128
"""
2229
MODEL_IDENTIFIERS = '1 {{model["id"]}}'
2330
{% endfor %}

‎cset-workflow/includes/histogram_field.cylc‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414
CSET_ADDOPTS = """
1515
--VARNAME='{{field}}'
1616
--MODEL_NAME='{{model_names}}'
17+
{% if SELECT_SUBAREA %}
18+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
19+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
20+
{% else %}
21+
--SUBAREA_TYPE='None'
22+
--SUBAREA_EXTENT='None'
23+
{% endif %}
1724
"""
1825
MODEL_IDENTIFIERS = {{model_ids}}
1926
{% endfor %}
@@ -33,6 +40,13 @@
3340
--LEVELTYPE='pressure'
3441
--LEVEL='{{plevel}}'
3542
--MODEL_NAME='{{model_names}}'
43+
{% if SELECT_SUBAREA %}
44+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
45+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
46+
{% else %}
47+
--SUBAREA_TYPE='None'
48+
--SUBAREA_EXTENT='None'
49+
{% endif %}
3650
"""
3751
MODEL_IDENTIFIERS = {{model_ids}}
3852
{% endfor %}
@@ -53,6 +67,13 @@
5367
--LEVELTYPE='model_level_number'
5468
--LEVEL='{{mlevel}}'
5569
--MODEL_NAME='{{model_names}}'
70+
{% if SELECT_SUBAREA %}
71+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
72+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
73+
{% else %}
74+
--SUBAREA_TYPE='None'
75+
--SUBAREA_EXTENT='None'
76+
{% endif %}
5677
"""
5778
MODEL_IDENTIFIERS = {{model_ids}}
5879
{% endfor %}

‎cset-workflow/includes/histogram_field_aggregation.cylc‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@
1717
CSET_ADDOPTS = """
1818
--VARNAME='{{field}}'
1919
--MODEL_NAME='{{model_names}}'
20+
{% if SELECT_SUBAREA %}
21+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
22+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
23+
{% else %}
24+
--SUBAREA_TYPE='None'
25+
--SUBAREA_EXTENT='None'
26+
{% endif %}
2027
"""
2128
MODEL_IDENTIFIERS = {{model_ids}}
2229
{% endfor %}
@@ -36,6 +43,13 @@
3643
--LEVELTYPE='pressure'
3744
--LEVEL='{{plevel}}'
3845
--MODEL_NAME='{{model_names}}'
46+
{% if SELECT_SUBAREA %}
47+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
48+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
49+
{% else %}
50+
--SUBAREA_TYPE='None'
51+
--SUBAREA_EXTENT='None'
52+
{% endif %}
3953
"""
4054
MODEL_IDENTIFIERS = {{model_ids}}
4155
{% endfor %}
@@ -56,6 +70,13 @@
5670
--LEVELTYPE='model_level_number'
5771
--LEVEL='{{mlevel}}'
5872
--MODEL_NAME='{{model_names}}'
73+
{% if SELECT_SUBAREA %}
74+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
75+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
76+
{% else %}
77+
--SUBAREA_TYPE='None'
78+
--SUBAREA_EXTENT='None'
79+
{% endif %}
5980
"""
6081
MODEL_IDENTIFIERS = {{model_ids}}
6182
{% endfor %}

‎cset-workflow/includes/histogram_field_aggregation_all.cylc‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414
CSET_ADDOPTS = """
1515
--VARNAME='{{field}}'
1616
--MODEL_NAME='{{model_names}}'
17+
{% if SELECT_SUBAREA %}
18+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
19+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
20+
{% else %}
21+
--SUBAREA_TYPE='None'
22+
--SUBAREA_EXTENT='None'
23+
{% endif %}
1724
"""
1825
MODEL_IDENTIFIERS = {{model_ids}}
1926

@@ -34,6 +41,13 @@
3441
--LEVELTYPE='pressure'
3542
--LEVEL='{{plevel}}'
3643
--MODEL_NAME='{{model_names}}'
44+
{% if SELECT_SUBAREA %}
45+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
46+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
47+
{% else %}
48+
--SUBAREA_TYPE='None'
49+
--SUBAREA_EXTENT='None'
50+
{% endif %}
3751
"""
3852
MODEL_IDENTIFIERS = {{model_ids}}
3953
{% endfor %}
@@ -54,6 +68,13 @@
5468
--LEVELTYPE='model_level_number'
5569
--LEVEL='{{mlevel}}'
5670
--MODEL_NAME='{{model_names}}'
71+
{% if SELECT_SUBAREA %}
72+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
73+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
74+
{% else %}
75+
--SUBAREA_TYPE='None'
76+
--SUBAREA_EXTENT='None'
77+
{% endif %}
5778
"""
5879
MODEL_IDENTIFIERS = {{model_ids}}
5980
{% endfor %}

‎cset-workflow/includes/mlevel_transect.cylc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414
--MODEL_NAME='{{model["name"]}}'
1515
--START_COORDS='{{MLEVEL_TRANSECT_STARTCOORDS}}'
1616
--FINISH_COORDS='{{MLEVEL_TRANSECT_FINISHCOORDS}}'
17+
{% if SELECT_SUBAREA %}
18+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
19+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
20+
{% else %}
21+
--SUBAREA_TYPE='None'
22+
--SUBAREA_EXTENT='None'
23+
{% endif %}
1724
"""
1825
MODEL_IDENTIFIERS = {{model["id"]}}
1926
{% endfor %}

‎cset-workflow/includes/plevel_transect.cylc‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414
--MODEL_NAME='{{model["name"]}}'
1515
--START_COORDS='{{PLEVEL_TRANSECT_STARTCOORDS}}'
1616
--FINISH_COORDS='{{PLEVEL_TRANSECT_FINISHCOORDS}}'
17+
{% if SELECT_SUBAREA %}
18+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
19+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
20+
{% else %}
21+
--SUBAREA_TYPE='None'
22+
--SUBAREA_EXTENT='None'
23+
{% endif %}
1724
"""
1825
MODEL_IDENTIFIERS = {{model["id"]}}
1926
{% endfor %}

‎cset-workflow/includes/profile_level.cylc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
--VARNAME='{{field}}'
1616
--LEVELTYPE='pressure'
1717
--MODEL_NAME='{{model_names}}'
18+
{% if SELECT_SUBAREA %}
19+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
20+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
21+
{% else %}
22+
--SUBAREA_TYPE='None'
23+
--SUBAREA_EXTENT='None'
24+
{% endif %}
1825
"""
1926
MODEL_IDENTIFIERS = {{model_ids}}
2027
{% endfor %}
@@ -32,6 +39,13 @@
3239
--VARNAME='{{field}}'
3340
--LEVELTYPE='model_level_number'
3441
--MODEL_NAME='{{model_names}}'
42+
{% if SELECT_SUBAREA %}
43+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
44+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
45+
{% else %}
46+
--SUBAREA_TYPE='None'
47+
--SUBAREA_EXTENT='None'
48+
{% endif %}
3549
"""
3650
MODEL_IDENTIFIERS = {{model_ids}}
3751
{% endfor %}

‎cset-workflow/includes/profile_level_aggregation.cylc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
--VARNAME='{{field}}'
1919
--LEVELTYPE='pressure'
2020
--MODEL_NAME='{{model_names}}'
21+
{% if SELECT_SUBAREA %}
22+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
23+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
24+
{% else %}
25+
--SUBAREA_TYPE='None'
26+
--SUBAREA_EXTENT='None'
27+
{% endif %}
2128
"""
2229
MODEL_IDENTIFIERS = {{model_ids}}
2330
{% endfor %}
@@ -35,6 +42,13 @@
3542
--VARNAME='{{field}}'
3643
--LEVELTYPE='model_level_number'
3744
--MODEL_NAME='{{model_names}}'
45+
{% if SELECT_SUBAREA %}
46+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
47+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
48+
{% else %}
49+
--SUBAREA_TYPE='None'
50+
--SUBAREA_EXTENT='None'
51+
{% endif %}
3852
"""
3953
MODEL_IDENTIFIERS = {{model_ids}}
4054
{% endfor %}

‎cset-workflow/includes/spatial_difference_field.cylc‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@
2020
--VARNAME='{{field}}'
2121
--BASE_MODEL='{{base_model["name"]}}'
2222
--OTHER_MODEL='{{model["name"]}}'
23+
{% if SELECT_SUBAREA %}
24+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
25+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
26+
{% else %}
27+
--SUBAREA_TYPE='None'
28+
--SUBAREA_EXTENT='None'
29+
{% endif %}
2330
"""
2431
MODEL_IDENTIFIERS = '1 {{model["id"]}}'
2532
{% endfor %}
@@ -40,6 +47,13 @@
4047
--LEVEL='{{plevel}}'
4148
--BASE_MODEL='{{base_model["name"]}}'
4249
--OTHER_MODEL='{{model["name"]}}'
50+
{% if SELECT_SUBAREA %}
51+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
52+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
53+
{% else %}
54+
--SUBAREA_TYPE='None'
55+
--SUBAREA_EXTENT='None'
56+
{% endif %}
4357
"""
4458
MODEL_IDENTIFIERS = '1 {{model["id"]}}'
4559
{% endfor %}
@@ -61,6 +75,13 @@
6175
--LEVEL='{{mlevel}}'
6276
--BASE_MODEL='{{base_model["name"]}}'
6377
--OTHER_MODEL='{{model["name"]}}'
78+
{% if SELECT_SUBAREA %}
79+
--SUBAREA_TYPE='{{SUBAREA_TYPE}}'
80+
--SUBAREA_EXTENT='{{SUBAREA_EXTENT}}'
81+
{% else %}
82+
--SUBAREA_TYPE='None'
83+
--SUBAREA_EXTENT='None'
84+
{% endif %}
6485
"""
6586
MODEL_IDENTIFIERS = '1 {{model["id"]}}'
6687
{% endfor %}

0 commit comments

Comments
 (0)