From 23c190c3f984c31f568236e03ee753b075adfe89 Mon Sep 17 00:00:00 2001 From: Hilary James Oliver Date: Mon, 21 Jun 2021 13:55:45 +1200 Subject: [PATCH] Remove obsoletion flow.cylc visualization section. --- .../writing-workflows/configuration.rst | 2 -- src/user-guide/writing-workflows/runtime.rst | 8 +++---- .../writing-workflows/scheduling.rst | 14 ------------- src/workflow-design-guide/efficiency.rst | 6 ++---- src/workflows/empy/cities/flow.cylc | 2 -- .../empy/cities/workflow-visualization.cylc | 9 -------- src/workflows/inherit/multi/one/flow.cylc | 21 ------------------- src/workflows/inherit/single/two/flow.cylc | 3 --- src/workflows/jinja2/cities/flow.cylc | 9 -------- src/workflows/satellite/ext-trigger/flow.cylc | 9 -------- 10 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 src/workflows/empy/cities/workflow-visualization.cylc diff --git a/src/user-guide/writing-workflows/configuration.rst b/src/user-guide/writing-workflows/configuration.rst index a86496aae7..f4933f2e76 100644 --- a/src/user-guide/writing-workflows/configuration.rst +++ b/src/user-guide/writing-workflows/configuration.rst @@ -196,8 +196,6 @@ several top level section headings: - workflow-wide defaults in the *root* namespace - a nested family hierarchy with common properties inherited by related tasks -:cylc:conf:`[visualization]` - Workflow graph styling .. _Validation: diff --git a/src/user-guide/writing-workflows/runtime.rst b/src/user-guide/writing-workflows/runtime.rst index c344d3080d..858e735929 100644 --- a/src/user-guide/writing-workflows/runtime.rst +++ b/src/user-guide/writing-workflows/runtime.rst @@ -130,10 +130,10 @@ from the root namespace: Workflow Visualization And Multiple Inheritance ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The first parent inherited by a namespace is also used as the -collapsible family group when visualizing the workflow. If this is not what -you want, you can demote the first parent for visualization purposes, -without affecting the order of inheritance of runtime properties: +The first parent a namespace inherits from doubles as the collapsible family +group in workflow UI views and visualization. If this is not what you want, you +can demote the first parent for visualization purposes, without affecting the +order of inheritance of runtime properties: .. code-block:: cylc diff --git a/src/user-guide/writing-workflows/scheduling.rst b/src/user-guide/writing-workflows/scheduling.rst index 1a19416f81..c1d4aa594b 100644 --- a/src/user-guide/writing-workflows/scheduling.rst +++ b/src/user-guide/writing-workflows/scheduling.rst @@ -651,14 +651,6 @@ For example, we can write our workflow like so, to produce the graph as shown: R1/T12 = "prep[^] => baz" T00 = "foo[-P1D] => foo => bar" T12 = "baz[-P1D] => baz => qux" - [visualization] - initial cycle point = 20130808T00 - final cycle point = 20130810T00 - [[node attributes]] - foo = "color=red" - bar = "color=orange" - baz = "color=green" - qux = "color=blue" .. container:: image @@ -705,12 +697,6 @@ the initial cycle point) and then repeat every ``PT6H`` (6 hours): foo[-PT6H] => foo foo => bar """ - [visualization] - initial cycle point = 20130808T00 - final cycle point = 20130808T18 - [[node attributes]] - foo = "color=red" - bar = "color=orange" .. container:: image diff --git a/src/workflow-design-guide/efficiency.rst b/src/workflow-design-guide/efficiency.rst index f3b807ab64..24449f4a55 100644 --- a/src/workflow-design-guide/efficiency.rst +++ b/src/workflow-design-guide/efficiency.rst @@ -16,11 +16,9 @@ The Task Family Hierarchy A properly designed family hierarchy fulfils three purposes in Cylc: -- efficient sharing of all configuration common to groups of related - tasks +- efficient sharing of configuration common to groups of related tasks - efficient bulk triggering, for clear scheduling graphs -- clean workflow visualization and monitoring, because families are - collapsible +- collapsible families in workflow visualization and UI views .. _Sharing By Inheritance: diff --git a/src/workflows/empy/cities/flow.cylc b/src/workflows/empy/cities/flow.cylc index 2e9aa62d0a..748a037f60 100644 --- a/src/workflows/empy/cities/flow.cylc +++ b/src/workflows/empy/cities/flow.cylc @@ -50,5 +50,3 @@ CLEANUP = True inherit = @CITY @[ end for ] @[ end for ] - -@empy.include("./workflow-visualization.cylc") diff --git a/src/workflows/empy/cities/workflow-visualization.cylc b/src/workflows/empy/cities/workflow-visualization.cylc deleted file mode 100644 index 7a2274b0c5..0000000000 --- a/src/workflows/empy/cities/workflow-visualization.cylc +++ /dev/null @@ -1,9 +0,0 @@ -[visualization] - initial cycle point = 2011-08-08T12 - final cycle point = 2011-08-08T23 - [[node groups]] - cleaning = clean, cleanup - [[node attributes]] - cleaning = 'style=filled', 'fillcolor=yellow' - NewYork = 'style=filled', 'fillcolor=lightblue' - diff --git a/src/workflows/inherit/multi/one/flow.cylc b/src/workflows/inherit/multi/one/flow.cylc index c21633af73..02a12e9dba 100644 --- a/src/workflows/inherit/multi/one/flow.cylc +++ b/src/workflows/inherit/multi/one/flow.cylc @@ -39,24 +39,3 @@ [[var_p1, var_p2]] inherit = VAR, PARALLEL - -[visualization] - # NOTE ON VISUALIZATION AND MULTIPLE INHERITANCE: overlapping - # family groups can have overlapping attributes, so long as - # non-conflicting attributes are used to style each group. Below, - # for example, OPS tasks are filled green and SERIAL tasks are - # outlined blue, so that ops_s1 and ops_s2 are green with a blue - # outline. But if the SERIAL tasks are explicitly styled as "not - # filled" (by setting "style=") this will override the fill setting - # in the (previously defined and therefore lower precedence) OPS - # group, making ops_s1 and ops_s2 unfilled with a blue outline. - # Alternatively you can just create a manual node group for ops_s1 - # and ops_s2 and style them separately. - [[node groups]] - #(see comment above:) - #serial_ops = ops_s1, ops_s2 - [[node attributes]] - OPS = "style=filled", "fillcolor=green" - SERIAL = "color=blue" #(see comment above:), "style=" - #(see comment above:) - #serial_ops = "color=blue", "style=filled", "fillcolor=green" diff --git a/src/workflows/inherit/single/two/flow.cylc b/src/workflows/inherit/single/two/flow.cylc index ee8f534995..8d889840d8 100644 --- a/src/workflows/inherit/single/two/flow.cylc +++ b/src/workflows/inherit/single/two/flow.cylc @@ -70,6 +70,3 @@ inherit = OPS [[[meta]]] description = "OPS ATOVS postprocessing" - -[visualization] - collapsed families = OPS, VAR, BAZ diff --git a/src/workflows/jinja2/cities/flow.cylc b/src/workflows/jinja2/cities/flow.cylc index 124f3bd9ee..2e38e433fb 100644 --- a/src/workflows/jinja2/cities/flow.cylc +++ b/src/workflows/jinja2/cities/flow.cylc @@ -50,12 +50,3 @@ inherit = {{ CITY }} {% endfor %} {% endfor %} - -[visualization] - initial cycle point = 2011-08-08T12 - final cycle point = 2011-08-08T23 - [[node groups]] - cleaning = clean, cleanup - [[node attributes]] - cleaning = 'style=filled', 'fillcolor=yellow' - NewYork = 'style=filled', 'fillcolor=lightblue' diff --git a/src/workflows/satellite/ext-trigger/flow.cylc b/src/workflows/satellite/ext-trigger/flow.cylc index f8c9495aea..1b08b84b72 100644 --- a/src/workflows/satellite/ext-trigger/flow.cylc +++ b/src/workflows/satellite/ext-trigger/flow.cylc @@ -117,12 +117,3 @@ rm -rf $CYLC_WORKFLOW_SHARE_DIR $CYLC_WORKFLOW_WORK_DIR """ [[[meta]]] title = collate all products from the workflow run - -[visualization] - default node attributes = "style=filled", "shape=box" - [[node attributes]] - satsim = "fillcolor=yellow" - WORKDIR = "fillcolor=limegreen" - get_data = "fillcolor=skyblue" - products = "fillcolor=orange" - collate = "fillcolor=red"