Changeset 8180d8 for src/units/particle/comm_mpi_particle.cpp

Timestamp:

Apr 5, 2013, 12:39:30 PM (13 years ago)

Author:

Julian Iseringhausen <julian.iseringhausen@…>

Children:

4a709e

Parents:

f57182

Message:

Merge stashed open boundary stuff.

File:

• src/units/particle/comm_mpi_particle.cpp (modified) (6 diffs)

src/units/particle/comm_mpi_particle.cpp

@@ -87 +87 @@
 
   for (int i=0; i<num_particles_local; ++i) {
-    index = static_cast<Index>((Vector(&x[3*i]) - grid.Extent().Begin()) / grid.Extent().MeshWidth());
+    index = grid.Global().GlobalBegin() + static_cast<Index>((Vector(&x[3*i]) - grid.Extent().Begin()) / grid.Extent().MeshWidth());
     for (int j=0; j<size; ++j)
       if (index.IsInBounds(begin_remote[j], end_remote[j])) {
-        send_buffer_x[j].push_back(x[3*i+0]);
-        send_buffer_x[j].push_back(x[3*i+1]);
-        send_buffer_x[j].push_back(x[3*i+2]);
-        send_buffer_q[j].push_back(q[i]);
-        send_buffer_ind[j].push_back(i);
-        break;
+        send_buffer_x[j].push_back(x[3*i+0]);
+        send_buffer_x[j].push_back(x[3*i+1]);
+        send_buffer_x[j].push_back(x[3*i+2]);
+        send_buffer_q[j].push_back(q[i]);
+        send_buffer_ind[j].push_back(i);
+        break;
       }
   }
@@ -242 +242 @@
       for (int j=0; j<3; ++j)
         if ((types.Offset()[i][j] < 0 && lc.Global().LocalBegin()[j] == 0) ||
-            (types.Offset()[i][j] > 0 && lc.Global().LocalEnd()[j] == lc.Global().GlobalSize()[j]))
+            (types.Offset()[i][j] > 0 && lc.Global().LocalEnd()[j] == lc.Global().GlobalEnd()[j]))
           offset[j] = -1.0 * types.Offset()[i][j] * lc.Extent().Size()[j];
         else
@@ -248 +248 @@
 
       for (ind.X() = types.NB()[i].Starts().X(); ind.X() < types.NB()[i].Starts().X()+types.NB()[i].Subsizes().X(); ++ind.X())
-        for (ind.Y() = types.NB()[i].Starts().Y(); ind.Y() < types.NB()[i].Starts().Y()+types.NB()[i].Subsizes().Y(); ++ind.Y())
-          for (ind.Z() = types.NB()[i].Starts().Z(); ind.Z() < types.NB()[i].Starts().Z()+types.NB()[i].Subsizes().Z(); ++ind.Z())
-            for (iter=lc(ind).begin(); iter!=lc(ind).end(); ++iter) {
+        for (ind.Y() = types.NB()[i].Starts().Y(); ind.Y() < types.NB()[i].Starts().Y()+types.NB()[i].Subsizes().Y(); ++ind.Y())
+          for (ind.Z() = types.NB()[i].Starts().Z(); ind.Z() < types.NB()[i].Starts().Z()+types.NB()[i].Subsizes().Z(); ++ind.Z())
+            for (iter=lc(ind).begin(); iter!=lc(ind).end(); ++iter) {
 
               for (int j=0; j<3; ++j)
@@ -260 +260 @@
               assert(lc.Extent().Begin().IsComponentwiseLessOrEqual((*iter)->Pos() + offset + halo_length));
               assert(lc.Extent().End().IsComponentwiseGreaterOrEqual((*iter)->Pos() + offset - halo_length));
-            }
+            }
 
       send_size[i] = types.NB()[i].Buffer().size();
@@ -266 +266 @@
 
       if (send_size[i] > 0)
-        MPI_Isend(&types.NB()[i].Buffer().front(), send_size[i], MPI_DOUBLE,
-                  types.NB()[i].Rank(), 4096+types.NB()[i].TagSend(),
-                  comm_global, &Request());
+        MPI_Isend(&types.NB()[i].Buffer().front(), send_size[i], MPI_DOUBLE,
+            types.NB()[i].Rank(), 4096+types.NB()[i].TagSend(),
+            comm_global, &Request());
     }
 
@@ -275 +275 @@
       MPI_Recv(&recv_size, 1, MPI_INT, types.Halo()[i].Rank(), 2048+types.Halo()[i].TagReceive(), comm_global, MPI_STATUS_IGNORE);
       if (recv_size > 0) {
-        types.Halo()[i].Buffer().resize(recv_size);
-        MPI_Irecv(&types.Halo()[i].Buffer().front(), recv_size, MPI_DOUBLE,
-                  types.Halo()[i].Rank(), 4096+types.Halo()[i].TagReceive(),
-                  comm_global, &Request());
+        types.Halo()[i].Buffer().resize(recv_size);
+        MPI_Irecv(&types.Halo()[i].Buffer().front(), recv_size, MPI_DOUBLE,
+            types.Halo()[i].Rank(), 4096+types.Halo()[i].TagReceive(),
+            comm_global, &Request());
       }
     }