From cdeeb55a6c9d7a5d7a08a1a2fff6a897f1b343ee Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Sun, 15 May 2016 16:14:38 +0100
Subject: [PATCH] Post-merge corrections
---
src/engine.c | 5 ++---
src/hydro/Minimal/hydro.h | 2 +-
src/hydro/Minimal/hydro_part.h | 6 +++---
src/partition.c | 4 ++--
src/scheduler.c | 4 ++--
src/space.c | 2 +-
src/task.c | 2 +-
src/task.h | 2 +-
8 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index 1f1f426138..76243b1e48 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -158,7 +158,7 @@ void engine_make_hierarchical_tasks(struct engine *e, struct cell *c,
if (c->split)
for (int k = 0; k < 8; k++)
if (c->progeny[k] != NULL)
- engine_make_ghost_tasks(e, c->progeny[k], super);
+ engine_make_hierarchical_tasks(e, c->progeny[k], super);
}
/**
@@ -1453,8 +1453,7 @@ void engine_maketasks(struct engine *e) {
depend on the sorts of its progeny. */
engine_count_and_link_tasks(e);
- /* Append a hierarchical task to each cell, and add kick tasks to the
- super cells. */
+ /* Append hierarchical tasks to each cells */
for (int k = 0; k < nr_cells; k++)
engine_make_hierarchical_tasks(e, &cells[k], NULL);
diff --git a/src/hydro/Minimal/hydro.h b/src/hydro/Minimal/hydro.h
index 8fa69384c3..01957065cf 100644
--- a/src/hydro/Minimal/hydro.h
+++ b/src/hydro/Minimal/hydro.h
@@ -117,7 +117,7 @@ __attribute__((always_inline))
/**
* @brief Prepare a particle for the force calculation.
*
- * This function is called in the hierarchy task to convert some quantities coming
+ * This function is called in the ghost task to convert some quantities coming
* from the density loop over neighbours into quantities ready to be used in the
* force loop over neighbours. Quantities are typically read from the density
* sub-structure and written to the force sub-structure.
diff --git a/src/hydro/Minimal/hydro_part.h b/src/hydro/Minimal/hydro_part.h
index b281b85ffc..2580ef2a94 100644
--- a/src/hydro/Minimal/hydro_part.h
+++ b/src/hydro/Minimal/hydro_part.h
@@ -22,7 +22,7 @@
*
* This structure contains the particle fields that are not used in the
* density or force loops. Quantities should be used in the kick, drift and
- * potentially hierarchical tasks only.
+ * potentially ghost tasks only.
*/
struct xpart {
@@ -76,7 +76,7 @@ struct part {
* neighbours.
*
* Quantities in this sub-structure should only be accessed in the density
- * loop over neighbours and the hierarchy task.
+ * loop over neighbours and the ghost task.
*/
struct {
@@ -91,7 +91,7 @@ struct part {
* neighbours.
*
* Quantities in this sub-structure should only be accessed in the force
- * loop over neighbours and the hierarchy and kick tasks.
+ * loop over neighbours and the ghost and kick tasks.
*/
struct {
diff --git a/src/partition.c b/src/partition.c
index a002b64991..70249a679e 100644
--- a/src/partition.c
+++ b/src/partition.c
@@ -454,7 +454,7 @@ static void repart_edge_metis(int partweights, int bothweights, int nodeID,
/* Skip un-interesting tasks. */
if (t->type != task_type_self && t->type != task_type_pair &&
- t->type != task_type_sub && t->type != task_type_hierarchy &&
+ t->type != task_type_sub && t->type != task_type_ghost &&
t->type != task_type_drift && t->type != task_type_kick &&
t->type != task_type_init)
continue;
@@ -488,7 +488,7 @@ static void repart_edge_metis(int partweights, int bothweights, int nodeID,
int cid = ci - cells;
/* Different weights for different tasks. */
- if (t->type == task_type_hierarchy || t->type == task_type_drift ||
+ if (t->type == task_type_ghost || t->type == task_type_drift ||
t->type == task_type_kick) {
/* Particle updates add only to vertex weight. */
if (taskvweights) weights_v[cid] += w;
diff --git a/src/scheduler.c b/src/scheduler.c
index 9175e08580..d1d343240b 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -916,7 +916,7 @@ void scheduler_reweight(struct scheduler *s) {
} else
t->weight += 1 * wscale * t->ci->count * t->ci->count;
break;
- case task_type_hierarchy:
+ case task_type_ghost:
if (t->ci == t->ci->super) t->weight += wscale * t->ci->count;
break;
case task_type_kick:
@@ -1082,7 +1082,7 @@ void scheduler_enqueue(struct scheduler *s, struct task *t) {
switch (t->type) {
case task_type_self:
case task_type_sort:
- case task_type_hierarchy:
+ case task_type_ghost:
case task_type_kick:
case task_type_drift:
case task_type_init:
diff --git a/src/space.c b/src/space.c
index 1386abe9eb..d87107a80a 100644
--- a/src/space.c
+++ b/src/space.c
@@ -350,7 +350,7 @@ void space_regrid(struct space *s, double cell_max, int verbose) {
s->cells[k].count = 0;
s->cells[k].gcount = 0;
s->cells[k].init = NULL;
- s->cells[k].hierarchy = NULL;
+ s->cells[k].ghost = NULL;
s->cells[k].drift = NULL;
s->cells[k].kick = NULL;
s->cells[k].super = &s->cells[k];
diff --git a/src/task.c b/src/task.c
index 70bfab6577..31c2bfcb34 100644
--- a/src/task.c
+++ b/src/task.c
@@ -48,7 +48,7 @@
/* Task type names. */
const char *taskID_names[task_type_count] = {
"none", "sort", "self", "pair", "sub",
- "init", "hierarchy", "drift", "kick", "send",
+ "init", "ghost", "drift", "kick", "send",
"recv", "grav_pp", "grav_mm", "grav_up", "grav_down",
"grav_external", "part_sort", "gpart_sort", "split_cell", "rewait"};
diff --git a/src/task.h b/src/task.h
index 78d0b4faf0..25cc886f4b 100644
--- a/src/task.h
+++ b/src/task.h
@@ -39,7 +39,7 @@ enum task_types {
task_type_pair,
task_type_sub,
task_type_init,
- task_type_hierarchy,
+ task_type_ghost,
task_type_drift,
task_type_kick,
task_type_send,
--
GitLab