Changeset 8180d8 for src/comm/mpi/datatype.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/comm/mpi/datatype.cpp (modified) (6 diffs)

src/comm/mpi/datatype.cpp

@@ -72 +72 @@
     for (i.X()=_starts.X(); i.X()<end.X();  ++i.X())
       for (i.Y()=_starts.Y(); i.Y()<end.Y(); ++i.Y()) {
-        std::memcpy(&_buffer[c], &grid.GetVal(i.X(), i.Y(), _starts.Z()), memcpy_size);
-        c += _subsizes.Z();
+        std::memcpy(&_buffer[c], &grid.GetVal(i.X(), i.Y(), _starts.Z()), memcpy_size);
+        c += _subsizes.Z();
       }
 
@@ -91 +91 @@
     for (i.X()=_starts.X(); i.X()<end.X();  ++i.X())
       for (i.Y()=_starts.Y(); i.Y()<end.Y(); ++i.Y()) {
-        std::memcpy(&_buffer[c], &grid.GetVal(i.X(), i.Y(), _starts.Z()), memcpy_size);
-        c += _subsizes.Z();
+        std::memcpy(&_buffer[c], &grid.GetVal(i.X(), i.Y(), _starts.Z()), memcpy_size);
+        c += _subsizes.Z();
       }
 
@@ -124 +124 @@
     for (i.X()=_starts.X(); i.X()<end.X(); ++i.X())
       for (i.Y()=_starts.Y(); i.Y()<end.Y(); ++i.Y()) {
-        std::memcpy(&grid(i.X(), i.Y(), _starts.Z()), &_buffer[c], memcpy_size);
-        c += _subsizes.Z();
+        std::memcpy(&grid(i.X(), i.Y(), _starts.Z()), &_buffer[c], memcpy_size);
+        c += _subsizes.Z();
       }
 
@@ -142 +142 @@
     for (i.X()=_starts.X(); i.X()<end.X(); ++i.X())
       for (i.Y()=_starts.Y(); i.Y()<end.Y(); ++i.Y())
-        for (i.Z()=_starts.Z(); i.Z()<end.Z(); ++i.Z())
-          grid(i) += *iter++;
+        for (i.Z()=_starts.Z(); i.Z()<end.Z(); ++i.Z())
+          grid(i) += *iter++;
 
     assert(iter == _buffer.end());
@@ -150 +150 @@
 
 void VMG::MPI::Datatype::Set(const GridIteratorSet& bounds, const Grid& grid, const int& rank,
-                             const int& tag_send, const int& tag_receive)
+    const int& tag_send, const int& tag_receive)
 {
   _sizes = grid.Local().SizeTotal();
@@ -166 +166 @@
 
 void VMG::MPI::Datatype::Set(const Index& sizes, const Index& subsizes, const Index& starts, const int& rank,
-                             const int& tag_send, const int& tag_receive)
+    const int& tag_send, const int& tag_receive)
 {
   _sizes = sizes;