Merge branch 'fix_dopair_vec_MPI' into 'master'

Set the nodeID for the engine and the cells to be the same.

See merge request !476

tests/test125cells.c

@@ -48,6 +48,8 @@
 #define DOPAIR2_NAME "runner_dopair2_force"
 #endif
 
+#define NODE_ID 1
+
 enum velocity_field {
   velocity_zero,
   velocity_const,
@@ -356,6 +358,7 @@ struct cell *make_cell(size_t n, const double offset[3], double size, double h,
   cell->ti_old_part = 8;
   cell->ti_hydro_end_min = 8;
   cell->ti_hydro_end_max = 8;
+  cell->nodeID = NODE_ID;
 
   // shuffle_particles(cell->parts, cell->count);
 
@@ -589,6 +592,7 @@ int main(int argc, char *argv[]) {
   engine.time = 0.1f;
   engine.ti_current = 8;
   engine.max_active_bin = num_time_bins;
+  engine.nodeID = NODE_ID;
 
   struct runner runner;
   runner.e = &engine;

tests/test27cells.c

@@ -57,6 +57,8 @@
 #define DOPAIR1_NAME "runner_dopair1_density"
 #endif
 
+#define NODE_ID 1
+
 enum velocity_types {
   velocity_zero,
   velocity_random,
@@ -184,6 +186,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   cell->ti_old_part = 8;
   cell->ti_hydro_end_min = 8;
   cell->ti_hydro_end_max = 8;
+  cell->nodeID = NODE_ID; 
 
   shuffle_particles(cell->parts, cell->count);
 
@@ -431,6 +434,7 @@ int main(int argc, char *argv[]) {
   engine.ti_current = 8;
   engine.max_active_bin = num_time_bins;
   engine.hydro_properties = &hp;
+  engine.nodeID = NODE_ID;
 
   struct runner runner;
   runner.e = &engine;

tests/testActivePair.c

@@ -29,6 +29,8 @@
 /* Local headers. */
 #include "swift.h"
 
+#define NODE_ID 1
+
 /* Typdef function pointer for interaction function. */
 typedef void (*interaction_func)(struct runner *, struct cell *, struct cell *);
 
@@ -143,6 +145,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   cell->ti_old_part = 8;
   cell->ti_hydro_end_min = 8;
   cell->ti_hydro_end_max = 10;
+  cell->nodeID = NODE_ID; 
 
   shuffle_particles(cell->parts, cell->count);
 
@@ -502,6 +505,7 @@ int main(int argc, char *argv[]) {
   engine.time = 0.1f;
   engine.ti_current = 8;
   engine.max_active_bin = num_time_bins;
+  engine.nodeID = NODE_ID;
 
   if (posix_memalign((void **)&runner, SWIFT_STRUCT_ALIGNMENT,
                      sizeof(struct runner)) != 0) {

tests/testPeriodicBC.c

@@ -49,6 +49,8 @@
 #define DOPAIR1_NAME "runner_dopair1_density"
 #endif
 
+#define NODE_ID 1
+
 enum velocity_types {
   velocity_zero,
   velocity_random,
@@ -173,6 +175,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
   cell->ti_old_part = 8;
   cell->ti_hydro_end_min = 8;
   cell->ti_hydro_end_max = 8;
+  cell->nodeID = NODE_ID;
 
   shuffle_particles(cell->parts, cell->count);
 
@@ -485,6 +488,7 @@ int main(int argc, char *argv[]) {
   engine.ti_current = 8;
   engine.max_active_bin = num_time_bins;
   engine.hydro_properties = &hp;
+  engine.nodeID = NODE_ID;
 
   struct runner runner;
   runner.e = &engine;