From 9de8cf1aa6b6e81d22d13e85d1c4761c637067f8 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Mon, 6 Mar 2017 18:25:54 +0000
Subject: [PATCH] Updated task plotting script
---
examples/plot_tasks.py | 11 ++++++-----
src/gravity.c | 6 ++----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/examples/plot_tasks.py b/examples/plot_tasks.py
index 978448b3cd..1be59d1c84 100755
--- a/examples/plot_tasks.py
+++ b/examples/plot_tasks.py
@@ -57,14 +57,15 @@ pl.rcParams.update(PLOT_PARAMS)
# Tasks and subtypes. Indexed as in tasks.h.
TASKTYPES = ["none", "sort", "self", "pair", "sub_self", "sub_pair",
"init", "ghost", "extra_ghost", "drift", "kick1", "kick2",
- "timestep", "send", "recv", "grav_gather_m", "grav_fft",
- "grav_mm", "grav_up", "cooling", "sourceterms", "count"]
+ "timestep", "send", "recv", "grav_top_level", "grav_long_range",
+ "grav_mm", "grav_down", "cooling", "sourceterms", "count"]
SUBTYPES = ["none", "density", "gradient", "force", "grav", "external_grav",
- "tend", "xv", "rho", "gpart", "count"]
+ "tend", "xv", "rho", "gpart", "multipole", "spart", "count"]
# Task/subtypes of interest.
-FULLTYPES = ["self/force", "self/density", "sub_self/force",
- "sub_self/density", "pair/force", "pair/density", "sub_pair/force",
+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",
"recv/tend", "send/tend"]
diff --git a/src/gravity.c b/src/gravity.c
index 5b89dd398f..ee7b9afa02 100644
--- a/src/gravity.c
+++ b/src/gravity.c
@@ -91,11 +91,9 @@ void gravity_exact_force_compute(struct space *s, const struct engine *e) {
}
}
- message("Computed exact gravity for %d gparts.", counter);
+ message("Computed exact gravity for %d gparts (took %.3f %s). ", counter,
+ clocks_from_ticks(getticks() - tic), clocks_getunit());
- if (e->verbose)
- message("took %.3f %s.", clocks_from_ticks(getticks() - tic),
- clocks_getunit());
#else
error("Gravity checking function called without the corresponding flag.");
#endif
--
GitLab