diff --git a/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc b/cylc/flow/etc/tutorial/consolidation-tutorial/flow.cylc index eacfc98a8a..abb1d76c72 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 @@ -87,11 +84,11 @@ 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 weather report for Exeter 300 minutes in the future. + script = post-process exeter 300 [[[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! diff --git a/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc b/cylc/flow/etc/tutorial/cylc-forecasting-workflow/flow.cylc index 86437e6c07..1c177d56f9 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,7 @@ 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 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' %}