Commit beea6ec9 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Updated the task plotting script to include the new gravity tasks

parent ad5c2154
......@@ -56,8 +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_pp", "grav_mm",
"grav_up", "grav_down", "grav_external", "part_sort", "gpart_sort",
"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"]
TASKCOLOURS = {"none": "black",
......@@ -73,10 +73,10 @@ TASKCOLOURS = {"none": "black",
"kick_fixdt": "green",
"send": "yellow",
"recv": "magenta",
"grav_pp": "mediumorchid",
"grav_gather_m": "mediumorchid",
"grav_fft": "mediumnightblue",
"grav_mm": "mediumturquoise",
"grav_up": "mediumvioletred",
"grav_down": "mediumnightblue",
"grav_external": "darkred",
"part_sort": "steelblue",
"gpart_sort": "teal" ,
......@@ -84,12 +84,13 @@ TASKCOLOURS = {"none": "black",
"rewait": "olive",
"count": "powerblue"}
SUBTYPES = ["none", "density", "force", "grav", "count"]
SUBTYPES = ["none", "density", "force", "grav", "tend", "count"]
SUBCOLOURS = {"none": "black",
"density": "red",
"force": "blue",
"grav": "indigo",
"tend": "grey"
"count": "purple"}
# Show docs if help is requested.
......
......@@ -62,8 +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_pp", "grav_mm",
"grav_up", "grav_down", "grav_external", "part_sort", "gpart_sort",
"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"]
TASKCOLOURS = {"none": "black",
......@@ -79,10 +79,10 @@ TASKCOLOURS = {"none": "black",
"kick_fixdt": "green",
"send": "yellow",
"recv": "magenta",
"grav_pp": "mediumorchid",
"grav_gather_m": "mediumorchid",
"grav_fft": "mediumnightblue",
"grav_mm": "mediumturquoise",
"grav_up": "mediumvioletred",
"grav_down": "mediumnightblue",
"grav_external": "darkred",
"part_sort": "steelblue",
"gpart_sort": "teal" ,
......@@ -90,12 +90,13 @@ TASKCOLOURS = {"none": "black",
"rewait": "olive",
"count": "powerblue"}
SUBTYPES = ["none", "density", "force", "grav", "count"]
SUBTYPES = ["none", "density", "force", "grav", "tend", "count"]
SUBCOLOURS = {"none": "black",
"density": "red",
"force": "blue",
"grav": "indigo",
"tend": "grey"
"count": "purple"}
# Show docs if help is requested.
......
......@@ -47,14 +47,14 @@
/* Task type names. */
const char *taskID_names[task_type_count] = {
"none", "sort", "self", "pair", "sub",
"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"};
const char *subtaskID_names[task_type_count] = {"none", "density", "force",
"grav"};
"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"};
const char *subtaskID_names[task_subtype_count] = {"none", "density", "force",
"grav", "tend"};
/**
* @brief Computes the overlap between the parts array of two given cells.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment