From eb4e0c474125c872f7d72936f87bc22bb66f9840 Mon Sep 17 00:00:00 2001 From: "Peter W. Draper" Date: Mon, 18 Apr 2016 17:21:16 +0100 Subject: [PATCH] Recover : for y command-line parameter and update task plotting scripts for external gravity --- examples/main.c | 2 +- examples/plot_tasks.py | 8 +++++--- examples/plot_tasks_MPI.py | 10 ++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/examples/main.c b/examples/main.c index d45384730..e8341bfe7 100644 --- a/examples/main.c +++ b/examples/main.c @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) { /* Parse the parameters */ int c; - while ((c = getopt(argc, argv, "cdef:gGhst:v:y")) != -1) switch (c) { + while ((c = getopt(argc, argv, "cdef:gGhst:v:y:")) != -1) switch (c) { case 'c': with_cosmology = 1; break; diff --git a/examples/plot_tasks.py b/examples/plot_tasks.py index 895c32ef9..c96d063e0 100755 --- a/examples/plot_tasks.py +++ b/examples/plot_tasks.py @@ -58,9 +58,10 @@ PLOT_PARAMS = {"axes.labelsize": 10, pl.rcParams.update(PLOT_PARAMS) # Tasks and subtypes. Indexed as in tasks.h. -TASKTYPES = ["none", "sort", "self", "pair", "sub", "init", "ghost", "drift", "kick", - "send", "recv", "grav_pp", "grav_mm", "grav_up", "grav_down", - "part_sort", "gpart_sort", "split_cell", "rewait", "count"] +TASKTYPES = ["none", "sort", "self", "pair", "sub", "init", "ghost", "drift", + "kick", "send", "recv", "grav_pp", "grav_mm", "grav_up", + "grav_down", "grav_external", "part_sort", "gpart_sort", + "split_cell", "rewait", "count"] TASKCOLOURS = {"none": "black", "sort": "lightblue", @@ -77,6 +78,7 @@ TASKCOLOURS = {"none": "black", "grav_mm": "mediumturquoise", "grav_up": "mediumvioletred", "grav_down": "mediumnightblue", + "grav_external": "darkred", "part_sort": "steelblue", "gpart_sort": "teal" , "split_cell": "seagreen", diff --git a/examples/plot_tasks_MPI.py b/examples/plot_tasks_MPI.py index d59fe6417..ae84b0177 100755 --- a/examples/plot_tasks_MPI.py +++ b/examples/plot_tasks_MPI.py @@ -64,9 +64,10 @@ PLOT_PARAMS = {"axes.labelsize": 10, pl.rcParams.update(PLOT_PARAMS) # Tasks and subtypes. Indexed as in tasks.h. -TASKTYPES = ["none", "sort", "self", "pair", "sub", "init", "ghost", "drift", "kick", - "send", "recv", "grav_pp", "grav_mm", "grav_up", "grav_down", - "part_sort", "gpart_sort", "split_cell", "rewait", "count"] +TASKTYPES = ["none", "sort", "self", "pair", "sub", "init", "ghost", "drift", + "kick", "send", "recv", "grav_pp", "grav_mm", "grav_up", + "grav_down", "grav_external", "part_sort", "gpart_sort", + "split_cell", "rewait", "count"] TASKCOLOURS = {"none": "black", "sort": "lightblue", @@ -83,8 +84,9 @@ TASKCOLOURS = {"none": "black", "grav_mm": "mediumturquoise", "grav_up": "mediumvioletred", "grav_down": "mediumnightblue", + "grav_external": "darkred", "part_sort": "steelblue", - "gpart_sort": "teal", + "gpart_sort": "teal" , "split_cell": "seagreen", "rewait": "olive", "count": "powerblue"} -- GitLab