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

src/comm/mpi/settings.cpp

@@ -96 +96 @@
 
     if (temp_grid->Global().LocalBegin().IsComponentwiseGreaterOrEqual(sol(i-1).Global().LocalBegin()) &&
-        temp_grid->Global().LocalBegin().IsComponentwiseLessOrEqual(sol(i-1).Global().LocalEnd()) &&
-        temp_grid->Global().LocalEnd().IsComponentwiseGreaterOrEqual(sol(i-1).Global().LocalBegin()) &&
-        temp_grid->Global().LocalEnd().IsComponentwiseLessOrEqual(sol(i-1).Global().LocalEnd())) {
+        temp_grid->Global().LocalBegin().IsComponentwiseLessOrEqual(sol(i-1).Global().LocalEnd()) &&
+        temp_grid->Global().LocalEnd().IsComponentwiseGreaterOrEqual(sol(i-1).Global().LocalBegin()) &&
+        temp_grid->Global().LocalEnd().IsComponentwiseLessOrEqual(sol(i-1).Global().LocalEnd())) {
       delete temp_grid;
       coarser_grids.insert(std::make_pair(&sol(i), &sol(i-1)));
@@ -113 +113 @@
 
     if (temp_grid->Global().LocalBegin().IsComponentwiseGreaterOrEqual(sol(i-1).Global().LocalBegin()) &&
-        temp_grid->Global().LocalBegin().IsComponentwiseLessOrEqual(sol(i-1).Global().LocalEnd()) &&
-        temp_grid->Global().LocalEnd().IsComponentwiseGreaterOrEqual(sol(i-1).Global().LocalBegin()) &&
-        temp_grid->Global().LocalEnd().IsComponentwiseLessOrEqual(sol(i-1).Global().LocalEnd())) {
+        temp_grid->Global().LocalBegin().IsComponentwiseLessOrEqual(sol(i-1).Global().LocalEnd()) &&
+        temp_grid->Global().LocalEnd().IsComponentwiseGreaterOrEqual(sol(i-1).Global().LocalBegin()) &&
+        temp_grid->Global().LocalEnd().IsComponentwiseLessOrEqual(sol(i-1).Global().LocalEnd())) {
       delete temp_grid;
       coarser_grids.insert(std::make_pair(&rhs(i), &rhs(i-1)));
@@ -133 +133 @@
 
     if (temp_grid->Global().LocalBegin() == sol(i+1).Global().LocalBegin() &&
-        temp_grid->Global().LocalEnd() == sol(i+1).Global().LocalEnd()) {
+        temp_grid->Global().LocalEnd() == sol(i+1).Global().LocalEnd()) {
       delete temp_grid;
       finer_grids.insert(std::make_pair(&sol(i), &sol(i+1)));
@@ -148 +148 @@
 
     if (temp_grid->Global().LocalBegin() == rhs(i+1).Global().LocalBegin() &&
-        temp_grid->Global().LocalEnd() == rhs(i+1).Global().LocalEnd()) {
+        temp_grid->Global().LocalEnd() == rhs(i+1).Global().LocalEnd()) {
       delete temp_grid;
       finer_grids.insert(std::make_pair(&rhs(i), &rhs(i+1)));
@@ -220 +220 @@
 
   const bool in_communicator = (grid_1->Global().LocalSize().Product() > 0) ||
-                               (grid_2 && grid_2->Global().LocalSize().Product() > 0) ||
-                               (grid_3 && grid_3->Global().LocalSize().Product() > 0);
+      (grid_2 && grid_2->Global().LocalSize().Product() > 0) ||
+      (grid_3 && grid_3->Global().LocalSize().Product() > 0);
 
   MPI_Comm_rank(comm_global, &rank);
@@ -263 +263 @@
     for (iter=communicators_local_unique.begin(); iter!=communicators_local_unique.end(); ++iter) {
       if (*iter != MPI_COMM_NULL) {
-        MPI_Comm_compare(comm_new, *iter, &comm_equal);
-        assert(comm_equal != MPI_SIMILAR);
-        if (comm_equal == MPI_IDENT || comm_equal == MPI_CONGRUENT) {
-          MPI_Comm_free(&comm_new);
-          comm_new = *iter;
-          break;
-        }
+        MPI_Comm_compare(comm_new, *iter, &comm_equal);
+        assert(comm_equal != MPI_SIMILAR);
+        if (comm_equal == MPI_IDENT || comm_equal == MPI_CONGRUENT) {
+          MPI_Comm_free(&comm_new);
+          comm_new = *iter;
+          break;
+        }
       }
     }
@@ -283 +283 @@
   bool dt_is_new = true;
 
-    // Insert into map
+  // Insert into map
   std::pair< std::map<VMG::MPI::KeyUnsorted, VMG::MPI::DatatypesGlobal>::iterator, bool > insert_result =
-    datatypes_global.insert(std::make_pair(VMG::MPI::KeyUnsorted(grid_old, grid_new, direction), VMG::MPI::DatatypesGlobal()));
+      datatypes_global.insert(std::make_pair(VMG::MPI::KeyUnsorted(grid_old, grid_new, direction), VMG::MPI::DatatypesGlobal()));
   VMG::MPI::DatatypesGlobal& dt_global = insert_result.first->second;
   dt_is_new = insert_result.second;
@@ -310 +310 @@
     if (&grid_old == &grid_new) {
       for (int i=0; i<6; ++i)
-        buffer[6*rank+i] = 0;
+        buffer[6*rank+i] = 0;
     }else {
       for (int i=0; i<3; ++i) {
-        buffer[6*rank+i] = grid_old.Global().LocalBegin()[i];
-        buffer[6*rank+i+3] = grid_old.Global().LocalEnd()[i];
+        buffer[6*rank+i] = grid_old.Global().LocalBegin()[i];
+        buffer[6*rank+i+3] = grid_old.Global().LocalEnd()[i];
       }
     }
@@ -324 +324 @@
       // Decide who offers a useful grid part
       for (int i=0; i<size; ++i) {
-        for (int j=0; j<3; ++j) {
-          begin[j] = buffer[6*i+j];
-          end[j] = buffer[6*i+j+3];
-        }
-
-        begin = begin.Clamp(grid_new.Global().LocalBegin(), grid_new.Global().LocalEnd());
-        end = end.Clamp(grid_new.Global().LocalBegin(), grid_new.Global().LocalEnd());
-
-        if ((end-begin).Product() > 0) {
-          // This process has a useful part
-          dt_global.Receive().push_back(VMG::MPI::Datatype(grid_new.Local().SizeTotal(),
-                                                           end - begin,
-                                                           begin - grid_new.Global().LocalBegin() + offset_new,
-                                                           i, 0, 0, true));
-        }
+        for (int j=0; j<3; ++j) {
+          begin[j] = buffer[6*i+j];
+          end[j] = buffer[6*i+j+3];
+        }
+
+        begin = begin.Clamp(grid_new.Global().LocalBegin(), grid_new.Global().LocalEnd());
+        end = end.Clamp(grid_new.Global().LocalBegin(), grid_new.Global().LocalEnd());
+
+        if ((end-begin).Product() > 0) {
+          // This process has a useful part
+          dt_global.Receive().push_back(VMG::MPI::Datatype(grid_new.Local().SizeTotal(),
+              end - begin,
+              begin - grid_new.Global().LocalBegin() + grid_new.Global().GlobalBegin() + offset_new,
+              i, 0, 0, true));
+        }
       }
     }
@@ -355 +355 @@
       for (int i=0; i<size; ++i) {
 
-        if ((i == rank) && (&grid_old == &grid_new))
-          continue;
-
-        for (int j=0; j<3; ++j) {
-          begin[j] = buffer[6*i+j];
-          end[j] = buffer[6*i+j+3];
-        }
-
-        begin = begin.Clamp(grid_old.Global().LocalBegin(), grid_old.Global().LocalEnd());
-        end = end.Clamp(grid_old.Global().LocalBegin(), grid_old.Global().LocalEnd());
-
-        if ((end-begin).Product() > 0) {
-          // This process needs one of my parts
-          dt_global.Send().push_back(VMG::MPI::Datatype(grid_old.Local().SizeTotal(),
-                                                        end - begin,
-                                                        begin - grid_old.Global().LocalBegin() + offset_old,
-                                                        i, 0, 0, true));
-        }
+        if ((i == rank) && (&grid_old == &grid_new))
+          continue;
+
+        for (int j=0; j<3; ++j) {
+          begin[j] = buffer[6*i+j];
+          end[j] = buffer[6*i+j+3];
+        }
+
+        begin = begin.Clamp(grid_old.Global().LocalBegin(), grid_old.Global().LocalEnd());
+        end = end.Clamp(grid_old.Global().LocalBegin(), grid_old.Global().LocalEnd());
+
+        if ((end-begin).Product() > 0) {
+          // This process needs one of my parts
+          dt_global.Send().push_back(VMG::MPI::Datatype(grid_old.Local().SizeTotal(),
+              end - begin,
+              begin - grid_old.Global().LocalBegin() + grid_old.Global().GlobalBegin() + offset_old,
+              i, 0, 0, true));
+        }
       }
     }
@@ -379 +379 @@
 
 MPI_Datatype& VMG::MPI::Settings::Datatype(const Index& begin, const Index& end,
-                                           const Index& size_local, const Index& size_global,
-                                           const int& level)
+    const Index& size_local, const Index& size_global,
+    const int& level)
 {
   KeyUnsorted k(begin, end, size_local, size_global, level, 0);