Ported engine.c

src/cell.h

@@ -111,7 +111,7 @@ struct cell {
   int nr_density, nr_force, nr_grav;
 
   /* The ghost task to link density to interactions. */
-  struct task *ghost, *kick1, *kick2;
+  struct task *ghost, *init, *drift, *kick;
 
   /* Task receiving data. */
   struct task *recv_xv, *recv_rho;

src/space.c

@@ -279,8 +279,10 @@ void space_regrid(struct space *s, double cell_max, int verbose) {
       s->cells[k].sorted = 0;
       s->cells[k].count = 0;
       s->cells[k].gcount = 0;
-      s->cells[k].kick1 = NULL;
-      s->cells[k].kick2 = NULL;
+      s->cells[k].init = NULL;
+      s->cells[k].ghost = NULL;      
+      s->cells[k].drift = NULL;
+      s->cells[k].kick = NULL;
       s->cells[k].super = &s->cells[k];
     }
     s->maxdepth = 0;