Merge branch 'tasks-graphs' into 'master'

Recover : for y command-line parameter and update task plotting scripts for external gravity

Fixes a problem from the parameter files branch and updates the
plotting scripts for external gravity.

See merge request !149

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;

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",

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"}