From a76703bce91255d41b2f852edf28661709d736d1 Mon Sep 17 00:00:00 2001 From: samuel-denton Date: Tue, 28 Apr 2026 15:11:03 +0100 Subject: [PATCH 1/9] Reverted https://github.com/cylc/cylc-flow/pull/7238 as order of tutorials has changed again. --- .../etc/tutorial/consolidation-tutorial/flow.cylc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc index eacfc98a8a..bd5d206f60 100644 --- a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc +++ b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc @@ -1,7 +1,4 @@ #!jinja2 - -{% set RESOLUTION = 0.2 %} - [scheduling] # Start the workflow 7 hours before now ignoring minutes and seconds # * previous(T-00) takes the current time ignoring minutes and seconds. @@ -55,7 +52,7 @@ script = consolidate-observations [[[environment]]] # The dimensions of each grid cell in degrees. - RESOLUTION = {{ RESOLUTION }} + RESOLUTION = 0.2 # The area to generate forecasts for (lng1, lat1, lng2, lat2) DOMAIN = -12,46,12,61 # Do not change! @@ -63,7 +60,7 @@ script = get-rainfall [[[environment]]] # The dimensions of each grid cell in degrees. - RESOLUTION = {{ RESOLUTION }} + RESOLUTION = 0.2 # The area to generate forecasts for (lng1, lat1, lng2, lat2) DOMAIN = -12,46,12,61 # Do not change! @@ -71,7 +68,7 @@ script = forecast 60 5 # Generate 5 forecasts at 60 minute intervals. [[[environment]]] # The dimensions of each grid cell in degrees. - RESOLUTION = {{ RESOLUTION }} + RESOLUTION = 0.2 # The area to generate forecasts for (lng1, lat1, lng2, lat2) DOMAIN = -12,46,12,61 # Do not change! # The path to the files containing wind data (the {variables} will @@ -91,7 +88,7 @@ script = post-process exeter 60 [[[environment]]] # The dimensions of each grid cell in degrees. - RESOLUTION = {{ RESOLUTION }} + RESOLUTION = 0.2 # The area to generate forecasts for (lng1, lat1, lng2, lat2) DOMAIN = -12,46,12,61 # Do not change! From 46f249d851a829ee7e61decba0b18aca67b637fe Mon Sep 17 00:00:00 2001 From: Samuel Denton Date: Wed, 6 May 2026 13:44:44 +0100 Subject: [PATCH 2/9] Update flow.cylc removed Jinja2 shebang as it is added by the next tutorial. --- cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc | 1 - 1 file changed, 1 deletion(-) diff --git a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc index bd5d206f60..5df5b9f5cd 100644 --- a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc +++ b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc @@ -1,4 +1,3 @@ -#!jinja2 [scheduling] # Start the workflow 7 hours before now ignoring minutes and seconds # * previous(T-00) takes the current time ignoring minutes and seconds. From 8614227133c9d07df627c9fb6fca184f80d0c6c8 Mon Sep 17 00:00:00 2001 From: Samuel Denton Date: Wed, 6 May 2026 15:22:30 +0100 Subject: [PATCH 3/9] Update flow.cylc Im stupid, this was needed for the includes statement at the end... --- cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc | 1 + 1 file changed, 1 insertion(+) diff --git a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc index 5df5b9f5cd..bd5d206f60 100644 --- a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc +++ b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc @@ -1,3 +1,4 @@ +#!jinja2 [scheduling] # Start the workflow 7 hours before now ignoring minutes and seconds # * previous(T-00) takes the current time ignoring minutes and seconds. From cf0f2b36c1d65a038263a6f936b27882efde745e Mon Sep 17 00:00:00 2001 From: samuel-denton Date: Wed, 13 May 2026 16:42:40 +0100 Subject: [PATCH 4/9] Improving the Jinja2 tutorial and fixing the order and flow of all consolidation tutorials. --- .../tutorial/consolidation-tutorial/flow.cylc | 4 ++-- .../tutorial/cylc-forecasting-workflow/flow.cylc | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc index bd5d206f60..b451204d89 100644 --- a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc +++ b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc @@ -84,8 +84,8 @@ MAP_TEMPLATE = "$CYLC_WORKFLOW_RUN_DIR/lib/template/map.html" [[post_process_exeter]] - # Generate a forecast for Exeter 60 minutes in the future. - script = post-process exeter 60 + # Generate a forecast for Exeter 300 minutes in the future. + script = post-process exeter 300 [[[environment]]] # The dimensions of each grid cell in degrees. RESOLUTION = 0.2 diff --git a/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc b/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc index 86437e6c07..7bfd9a5f18 100644 --- a/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc +++ b/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc @@ -1,9 +1,14 @@ #!jinja2 + +{# Generate 5 forecasts at 60 minute intervals. #} +{% set FORECAST_LENGTH = 60 %} +{% set FORECAST_COUNT = 5 %} + [task parameters] # A list of the weather stations we will be fetching observations from. - station = camborne, heathrow, shetland, aldergrove + station = aldergrove, camborne, heathrow, shetland # A list of the sites we will be generating forecasts for. - site = exeter + site = exeter, edinburgh [scheduling] # Start the workflow 7 hours before now ignoring minutes and seconds @@ -67,7 +72,7 @@ script = get-rainfall [[forecast]] - script = forecast 60 5 # Generate 5 forecasts at 60 minute intervals. + script = forecast {{ FORECAST_LENGTH }} {{ FORECAST_COUNT }} # Generate 5 forecasts at 60 minute intervals. [[[environment]]] # The path to the files containing wind data (the {variables} will # get substituted in the forecast script). @@ -82,7 +87,8 @@ MAP_TEMPLATE = "$CYLC_WORKFLOW_RUN_DIR/lib/template/map.html" [[post_process]] - # Generate a forecast for the location 60 minutes in the future. - script = post-process $CYLC_TASK_PARAM_site 60 + # Generate a forecast for the location + # {{ FORECAST_LENGTH * FORECAST_COUNT }} minutes in the future + script = post-process $CYLC_TASK_PARAM_site {{ FORECAST_LENGTH * FORECAST_COUNT }} {% include 'etc/python-job.settings' %} From df1a5bba3d4b9699336cf017ff7fd6831884ce3d Mon Sep 17 00:00:00 2001 From: samuel-denton Date: Wed, 13 May 2026 16:59:54 +0100 Subject: [PATCH 5/9] Comment updated --- cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc b/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc index 7bfd9a5f18..f32b42b114 100644 --- a/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc +++ b/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc @@ -87,8 +87,7 @@ MAP_TEMPLATE = "$CYLC_WORKFLOW_RUN_DIR/lib/template/map.html" [[post_process]] - # Generate a forecast for the location - # {{ FORECAST_LENGTH * FORECAST_COUNT }} minutes in the future + # Generate a forecast {{ FORECAST_LENGTH * FORECAST_COUNT }} minutes in the future for script = post-process $CYLC_TASK_PARAM_site {{ FORECAST_LENGTH * FORECAST_COUNT }} {% include 'etc/python-job.settings' %} From 8a42bec707fc0a179ecd492e16f544d406a0e651 Mon Sep 17 00:00:00 2001 From: Samuel Denton Date: Fri, 22 May 2026 12:12:37 +0100 Subject: [PATCH 6/9] Wording clarified Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> --- cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc b/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc index f32b42b114..b178498f75 100644 --- a/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc +++ b/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc @@ -87,7 +87,7 @@ MAP_TEMPLATE = "$CYLC_WORKFLOW_RUN_DIR/lib/template/map.html" [[post_process]] - # Generate a forecast {{ FORECAST_LENGTH * FORECAST_COUNT }} minutes in the future for + # Generate a weather report for {{ FORECAST_LENGTH * FORECAST_COUNT }} minutes in the future for script = post-process $CYLC_TASK_PARAM_site {{ FORECAST_LENGTH * FORECAST_COUNT }} {% include 'etc/python-job.settings' %} From 0e38f42e37091de7c181f6a75438b9ee422b3742 Mon Sep 17 00:00:00 2001 From: Samuel Denton Date: Fri, 22 May 2026 12:15:14 +0100 Subject: [PATCH 7/9] wording clarified --- cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc index b451204d89..abb1d76c72 100644 --- a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc +++ b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc @@ -84,7 +84,7 @@ MAP_TEMPLATE = "$CYLC_WORKFLOW_RUN_DIR/lib/template/map.html" [[post_process_exeter]] - # Generate a forecast for Exeter 300 minutes in the future. + # Generate a weather report for Exeter 300 minutes in the future. script = post-process exeter 300 [[[environment]]] # The dimensions of each grid cell in degrees. From ab84f0c2d049af674935a1f64394da199f17b022 Mon Sep 17 00:00:00 2001 From: Samuel Denton Date: Wed, 27 May 2026 10:53:03 +0100 Subject: [PATCH 8/9] Removed JinJa2 from comment Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> --- cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc b/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc index b178498f75..1c177d56f9 100644 --- a/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc +++ b/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc @@ -87,7 +87,7 @@ MAP_TEMPLATE = "$CYLC_WORKFLOW_RUN_DIR/lib/template/map.html" [[post_process]] - # Generate a weather report for {{ FORECAST_LENGTH * FORECAST_COUNT }} minutes in the future for + # Generate a weather report for [length * count] minutes in the future for script = post-process $CYLC_TASK_PARAM_site {{ FORECAST_LENGTH * FORECAST_COUNT }} {% include 'etc/python-job.settings' %} From b525e45a09d49221e3f44c9ee6e72b8714c14f46 Mon Sep 17 00:00:00 2001 From: Oliver Sanders Date: Tue, 2 Jun 2026 11:42:12 +0100 Subject: [PATCH 9/9] tutorial: replace blank line --- cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc | 1 + 1 file changed, 1 insertion(+) diff --git a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc index abb1d76c72..cddea9aa40 100644 --- a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc +++ b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc @@ -1,4 +1,5 @@ #!jinja2 + [scheduling] # Start the workflow 7 hours before now ignoring minutes and seconds # * previous(T-00) takes the current time ignoring minutes and seconds.