diff --git a/examples/plot_tasks.py b/examples/plot_tasks.py index f2d0aa95d1f35f30476e1989349a07be8d9e5b0a..6e71f476a106937f43bd4bd5973af01f65218afe 100755 --- a/examples/plot_tasks.py +++ b/examples/plot_tasks.py @@ -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. diff --git a/examples/plot_tasks_MPI.py b/examples/plot_tasks_MPI.py index 9a92faf9417c9a302831eb8cb2f4471eb672d59c..7550899da2d4a34a5f73b192cbd7c348426786b7 100755 --- a/examples/plot_tasks_MPI.py +++ b/examples/plot_tasks_MPI.py @@ -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. diff --git a/src/task.c b/src/task.c index e9404ab00df4f757f49d6d186f28dc40c49cfa01..9296ee6068ba04ff9243f6d8ea31507822c4b80d 100644 --- a/src/task.c +++ b/src/task.c @@ -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.