MPI not working yet. Need to think about logic

Author: hannorein

src/communication_mpi.c

@@ -154,6 +154,8 @@ void reb_communication_mpi_distribute_particles(struct reb_simulation* const r){
     }
 }
 
+// Distribute all particle to all other nodes, but do not add to local simulation.
+// Used for energy calculation (not ideal, should be improved).
 void reb_communication_mpi_distribute_particles_all_to_all(struct reb_simulation* const r){
     // Distribute the number of particles to be transferred.
     MPI_Allgather(&r->N, 1, MPI_INT, r->N_particles_recv, 1, MPI_INT, MPI_COMM_WORLD);

src/gravity.c

@@ -1429,6 +1429,25 @@ void reb_calculate_and_apply_jerk(struct reb_simulation* r, const double v){
  */
 static void reb_calculate_acceleration_for_particle_from_cell(const struct reb_simulation* const r, const int pt, const struct reb_treecell *node, const struct reb_vec6d gb);
 
+// For debugging
+void reb_tree_print(const struct reb_treecell *node, int indent){
+    for (int o=0; o<8; o++) {
+        if (node->oct[o] != NULL) {
+            for (int i=0;i<indent;i++){
+                printf(" ");
+            }
+            printf("%d",o);
+            reb_tree_print(node->oct[o], indent++);
+        }
+    }
+    if (node->pt >=0){
+        for (int i=0;i<indent;i++){
+            printf(" ");
+        }
+        printf("pt=%d\n",node->pt);
+    }
+}
+
 static void reb_calculate_acceleration_for_particle(const struct reb_simulation* const r, const int pt, const struct reb_vec6d gb) {
     for(size_t i=0;i<r->N_root;i++){
         struct reb_treecell* node = r->tree_root[i];

src/tree.c

@@ -72,10 +72,7 @@ void reb_tree_add_particle_to_tree(struct reb_simulation* const r, int pt){
     } 
     int rootbox = reb_get_rootbox_for_particle(r, p);
 #ifdef MPI
-    // Do not add particles that do not belong to this tree (avoid removing active particles)
-    int N_root_per_node = r->N_root/r->mpi_num;
-    int proc_id = rootbox/N_root_per_node;
-    if (proc_id!=r->mpi_id) return;
+    if (reb_communication_mpi_rootbox_is_local(r, rootbox)==0) return;
 #endif 	// MPI
     r->tree_root[rootbox] = reb_tree_add_particle_to_cell(r, r->tree_root[rootbox],pt,NULL,0);
 }