cell_getid() now moved to cell.h and uniquely defined there.

src/cell.h

@@ -164,6 +164,12 @@ struct cell {
 
 } __attribute__((aligned(64)));
 
+
+/* Convert cell location to ID. */
+#define cell_getid(cdim, i, j, k) \
+  ((int)(k) + (cdim)[2] * ((int)(j) + (cdim)[1] * (int)(i)))
+
+
 /* Function prototypes. */
 void cell_split(struct cell *c);
 int cell_locktree(struct cell *c);

src/engine.c

@@ -65,10 +65,6 @@ const char *engine_policy_names[10] = {
     "none",   "rand",     "steal",     "keep", "block",
     "fix_dt", "multi_dt", "cpu_tight", "mpi",  "numa_affinity"};
 
-/* Convert cell location to ID. */
-#define cell_getid(cdim, i, j, k) \
-  ((int)(k) + (cdim)[2] * ((int)(j) + (cdim)[1] * (int)(i)))
-
 /** The rank of the engine as a global variable (for messages). */
 int engine_rank;
 

src/space.h

@@ -37,10 +37,6 @@ struct engine;
 #define space_maxreldx 0.25f
 #define space_qstack 2048
 
-/* Convert cell location to ID. */
-#define cell_getid(cdim, i, j, k) \
-  ((int)(k) + (cdim)[2] * ((int)(j) + (cdim)[1] * (int)(i)))
-
 /* Split size. */
 extern int space_splitsize;
 extern int space_maxsize;