From a3ba56c914313f7f7c1f52d5418ff2efe62c1a7b Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Mon, 22 Aug 2016 19:58:41 +0100
Subject: [PATCH] Updated task plotting script for the new gradient loop
---
examples/plot_tasks.py | 15 +++++----------
examples/plot_tasks_MPI.py | 15 +++++----------
2 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/examples/plot_tasks.py b/examples/plot_tasks.py
index 6ee9acbf47..fb8b2ce57a 100755
--- a/examples/plot_tasks.py
+++ b/examples/plot_tasks.py
@@ -56,9 +56,8 @@ pl.rcParams.update(PLOT_PARAMS)
# Tasks and subtypes. Indexed as in tasks.h.
TASKTYPES = ["none", "sort", "self", "pair", "sub_self", "sub_pair", "init", "ghost",
- "drift", "kick", "kick_fixdt", "send", "recv", "grav_gather_m", "grav_fft",
- "grav_mm", "grav_up", "grav_external", "part_sort", "gpart_sort",
- "split_cell", "rewait", "count"]
+ "kick", "kick_fixdt", "send", "recv", "grav_gather_m", "grav_fft",
+ "grav_mm", "grav_up", "grav_external", "count"]
TASKCOLOURS = {"none": "black",
"sort": "lightblue",
@@ -68,7 +67,6 @@ TASKCOLOURS = {"none": "black",
"sub_pair": "navy",
"init": "indigo",
"ghost": "cyan",
- "drift": "maroon",
"kick": "green",
"kick_fixdt": "green",
"send": "yellow",
@@ -78,20 +76,17 @@ TASKCOLOURS = {"none": "black",
"grav_mm": "mediumturquoise",
"grav_up": "mediumvioletred",
"grav_external": "darkred",
- "part_sort": "steelblue",
- "gpart_sort": "teal" ,
- "split_cell": "seagreen",
- "rewait": "olive",
"count": "powerblue"}
-SUBTYPES = ["none", "density", "force", "grav", "tend", "count"]
+SUBTYPES = ["none", "density", "gradient", "force", "grav", "tend", "count"]
SUBCOLOURS = {"none": "black",
"density": "red",
+ "gradient": "powerblue",
"force": "blue",
"grav": "indigo",
"tend": "grey",
- "count": "purple"}
+ "count": "black"}
# Show docs if help is requested.
if len( sys.argv ) == 2 and ( sys.argv[1][0:2] == "-h" or sys.argv[1][0:3] == "--h" ):
diff --git a/examples/plot_tasks_MPI.py b/examples/plot_tasks_MPI.py
index f5e87c8fe9..398324cdc7 100755
--- a/examples/plot_tasks_MPI.py
+++ b/examples/plot_tasks_MPI.py
@@ -62,9 +62,8 @@ pl.rcParams.update(PLOT_PARAMS)
# Tasks and subtypes. Indexed as in tasks.h.
TASKTYPES = ["none", "sort", "self", "pair", "sub_self", "sub_pair", "init", "ghost",
- "drift", "kick", "kick_fixdt", "send", "recv", "grav_gather_m", "grav_fft",
- "grav_mm", "grav_up", "grav_external", "part_sort", "gpart_sort",
- "split_cell", "rewait", "count"]
+ "kick", "kick_fixdt", "send", "recv", "grav_gather_m", "grav_fft",
+ "grav_mm", "grav_up", "grav_external", "count"]
TASKCOLOURS = {"none": "black",
"sort": "lightblue",
@@ -74,7 +73,6 @@ TASKCOLOURS = {"none": "black",
"sub_pair": "navy",
"init": "indigo",
"ghost": "cyan",
- "drift": "maroon",
"kick": "green",
"kick_fixdt": "green",
"send": "yellow",
@@ -84,20 +82,17 @@ TASKCOLOURS = {"none": "black",
"grav_mm": "mediumturquoise",
"grav_up": "mediumvioletred",
"grav_external": "darkred",
- "part_sort": "steelblue",
- "gpart_sort": "teal" ,
- "split_cell": "seagreen",
- "rewait": "olive",
"count": "powerblue"}
-SUBTYPES = ["none", "density", "force", "grav", "tend", "count"]
+SUBTYPES = ["none", "density", "gradient", "force", "grav", "tend", "count"]
SUBCOLOURS = {"none": "black",
"density": "red",
+ "gradient": "powerblue",
"force": "blue",
"grav": "indigo",
"tend": "grey",
- "count": "purple"}
+ "count": "black"}
# Show docs if help is requested.
if len( sys.argv ) == 2 and ( sys.argv[1][0:2] == "-h" or sys.argv[1][0:3] == "--h" ):
--
GitLab