Merge branch 'GhostRename' of gitlab.cosma.dur.ac.uk:swift/swiftsim into GhostRename

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_hierarchical_tasks(e, c->progeny[k], super);
+        engine_make_ghost_tasks(e, c->progeny[k], super);
 }
 
 /**
@@ -1459,8 +1459,7 @@ void engine_maketasks(struct engine *e) {
     engine_make_hierarchical_tasks(e, &cells[k], NULL);
 
   /* Run through the tasks and make force tasks for each density task.
-     Each force task depends on the cell hierarchy tasks and unlocks the kick
-     task
+     Each force task depends on the cell ghosts and unlocks the kick task
      of its super-cell. */
   engine_make_extra_hydroloop_tasks(e);
 

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_ghost:
+        case task_type_hierarchy:
           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_ghost:
+      case task_type_hierarchy:
       case task_type_kick:
       case task_type_drift:
       case task_type_init:

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].ghost = NULL;
+      s->cells[k].hierarchy = NULL;
       s->cells[k].drift = NULL;
       s->cells[k].kick = NULL;
       s->cells[k].super = &s->cells[k];

src/task.c

@@ -48,7 +48,7 @@
 /* Task type names. */
 const char *taskID_names[task_type_count] = {
     "none",          "sort",      "self",       "pair",       "sub",
-    "init",          "ghost",     "drift",      "kick",       "send",
+    "init",          "hierarchy",     "drift",      "kick",       "send",
     "recv",          "grav_pp",   "grav_mm",    "grav_up",    "grav_down",
     "grav_external", "part_sort", "gpart_sort", "split_cell", "rewait"};
 

src/task.h

@@ -39,7 +39,7 @@ enum task_types {
   task_type_pair,
   task_type_sub,
   task_type_init,
-  task_type_ghost,
+  task_type_hierarchy,
   task_type_drift,
   task_type_kick,
   task_type_send,