From 080200da3c8c97b994ae000bc4c89f1abddae40c Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Fri, 30 Jun 2017 15:54:40 +0200
Subject: [PATCH] Correctly count the number of cell->task links required and
only create the necessary number given the engine policy.
---
src/engine.c | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 827778100f..7a3edece87 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -2416,17 +2416,31 @@ void engine_maketasks(struct engine *e) {
/* Split the tasks. */
scheduler_splittasks(sched);
- /* Allocate the list of cell-task links. The maximum number of links is the
- * number of cells (s->tot_cells) times the number of neighbours (26) times
- * the number of interaction types, so 26 * 3 (density, force, grav) pairs
- * and 4 (density, force, grav, ext_grav) self.
- */
+ /* Free the old list of cell-task links. */
if (e->links != NULL) free(e->links);
+ e->size_links = 0;
+
+/* The maximum number of links is the
+ * number of cells (s->tot_cells) times the number of neighbours (26) times
+ * the number of interaction types, so 26 * 2 (density, force) pairs
+ * and 2 (density, force) self.
+ */
#ifdef EXTRA_HYDRO_LOOP
- e->size_links = s->tot_cells * (26 * 4 + 4);
+ const int hydro_tasks_per_cell = 27 * 3;
#else
- e->size_links = s->tot_cells * (26 * 3 + 4);
+ const int hydro_tasks_per_cell = 27 * 2;
#endif
+ const int self_grav_tasks_per_cell = 27 * 2;
+ const int ext_grav_tasks_per_cell = 1;
+
+ if (e->policy & engine_policy_hydro)
+ e->size_links += s->tot_cells * hydro_tasks_per_cell;
+ if (e->policy & engine_policy_external_gravity)
+ e->size_links += s->tot_cells * ext_grav_tasks_per_cell;
+ if (e->policy & engine_policy_self_gravity)
+ e->size_links += s->tot_cells * self_grav_tasks_per_cell;
+
+ /* Allocate the new list */
if ((e->links = malloc(sizeof(struct link) * e->size_links)) == NULL)
error("Failed to allocate cell-task links.");
e->nr_links = 0;
--
GitLab