From 03cfe0e710cdff6f3937a41d231990850facd660 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Tue, 25 Jul 2017 15:04:07 +0100
Subject: [PATCH] Updated task plotting script for the new gravity tasks.
---
examples/analyse_tasks.py | 4 ++--
examples/plot_tasks.py | 13 +++++++------
src/task.h | 1 +
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/examples/analyse_tasks.py b/examples/analyse_tasks.py
index d28553173e..970c4a9104 100755
--- a/examples/analyse_tasks.py
+++ b/examples/analyse_tasks.py
@@ -50,8 +50,8 @@ infile = args.input
TASKTYPES = ["none", "sort", "self", "pair", "sub_self", "sub_pair",
"init_grav", "ghost", "extra_ghost", "drift_part",
"drift_gpart", "kick1", "kick2", "timestep", "send", "recv",
- "grav_top_level", "grav_long_range", "grav_mm", "grav_down",
- "cooling", "sourceterms", "count"]
+ "grav_top_level", "grav_long_range", "grav_ghost", "grav_mm",
+ "grav_down", "cooling", "sourceterms", "count"]
SUBTYPES = ["none", "density", "gradient", "force", "grav", "external_grav",
"tend", "xv", "rho", "gpart", "multipole", "spart", "count"]
diff --git a/examples/plot_tasks.py b/examples/plot_tasks.py
index e80c3635cf..c49020939c 100755
--- a/examples/plot_tasks.py
+++ b/examples/plot_tasks.py
@@ -91,17 +91,18 @@ pl.rcParams.update(PLOT_PARAMS)
TASKTYPES = ["none", "sort", "self", "pair", "sub_self", "sub_pair",
"init_grav", "ghost", "extra_ghost", "drift_part",
"drift_gpart", "kick1", "kick2", "timestep", "send", "recv",
- "grav_top_level", "grav_long_range", "grav_mm", "grav_down",
- "cooling", "sourceterms", "count"]
+ "grav_top_level", "grav_long_range", "grav_ghost", "grav_mm",
+ "grav_down", "cooling", "sourceterms", "count"]
SUBTYPES = ["none", "density", "gradient", "force", "grav", "external_grav",
"tend", "xv", "rho", "gpart", "multipole", "spart", "count"]
# Task/subtypes of interest.
FULLTYPES = ["self/force", "self/density", "self/grav", "sub_self/force",
- "sub_self/density", "pair/force", "pair/density", "pair/grav",
- "sub_pair/force",
- "sub_pair/density", "recv/xv", "send/xv", "recv/rho", "send/rho",
+ "sub_self/density", "sub_self/grav", "pair/force", "pair/density",
+ "pair/grav", "sub_pair/force",
+ "sub_pair/density", "sub_pair/grav", "recv/xv", "send/xv",
+ "recv/rho", "send/rho",
"recv/tend", "send/tend"]
# A number of colours for the various types. Recycled when there are
@@ -109,7 +110,7 @@ FULLTYPES = ["self/force", "self/density", "self/grav", "sub_self/force",
colours = ["cyan", "lightgray", "darkblue", "yellow", "tan", "dodgerblue",
"sienna", "aquamarine", "bisque", "blue", "green", "lightgreen",
"brown", "purple", "moccasin", "olivedrab", "chartreuse",
- "darksage", "darkgreen", "green", "mediumseagreen",
+ "steelblue", "darkgreen", "green", "mediumseagreen",
"mediumaquamarine", "darkslategrey", "mediumturquoise",
"black", "cadetblue", "skyblue", "red", "slategray", "gold",
"slateblue", "blueviolet", "mediumorchid", "firebrick",
diff --git a/src/task.h b/src/task.h
index cd15e09cc5..dee888c9f1 100644
--- a/src/task.h
+++ b/src/task.h
@@ -36,6 +36,7 @@
* @brief The different task types.
*
* Be sure to update the taskID_names array in tasks.c if you modify this list!
+ * Also update the python task plotting scripts!
*/
enum task_types {
task_type_none = 0,
--
GitLab