Changeset e85cfd for src/comm/mpi/settings.cpp

Timestamp:

Apr 9, 2013, 9:45:13 AM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

0bd47e

Parents:

4a709e

Message:

Work.

File:

• src/comm/mpi/settings.cpp (modified) (9 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())) {
       delete temp_grid;
@@ -107 +105 @@
   }
 
+  //FIXME
   for (int i=rhs.MaxLevel(); i>rhs.MinLevel(); --i) {
 
@@ -112 +111 @@
     temp_grid->SetPropertiesToCoarser(rhs(i), comm.BoundaryConditions());
 
-    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())) {
+    if (temp_grid->Global().LocalBegin().IsComponentwiseGreaterOrEqual(rhs(i-1).Global().LocalBegin()) &&
+        temp_grid->Global().LocalEnd().IsComponentwiseLessOrEqual(rhs(i-1).Global().LocalEnd())) {
       delete temp_grid;
       coarser_grids.insert(std::make_pair(&rhs(i), &rhs(i-1)));
@@ -132 +129 @@
     temp_grid->SetPropertiesToFiner(sol(i), comm.BoundaryConditions());
 
-    if (temp_grid->Global().LocalBegin() == sol(i+1).Global().LocalBegin() &&
-        temp_grid->Global().LocalEnd() == sol(i+1).Global().LocalEnd()) {
+    if (temp_grid->Global().LocalBegin().IsComponentwiseGreaterOrEqual(sol(i+1).Global().LocalBegin()) &&
+        temp_grid->Global().LocalEnd().IsComponentwiseLessOrEqual(sol(i+1).Global().LocalEnd())) {
       delete temp_grid;
       finer_grids.insert(std::make_pair(&sol(i), &sol(i+1)));
@@ -147 +144 @@
     temp_grid->SetPropertiesToFiner(rhs(i), comm.BoundaryConditions());
 
-    if (temp_grid->Global().LocalBegin() == rhs(i+1).Global().LocalBegin() &&
-        temp_grid->Global().LocalEnd() == rhs(i+1).Global().LocalEnd()) {
+    if (temp_grid->Global().LocalBegin().IsComponentwiseGreaterOrEqual(rhs(i+1).Global().LocalBegin()) &&
+        temp_grid->Global().LocalEnd().IsComponentwiseLessOrEqual(rhs(i+1).Global().LocalEnd())) {
       delete temp_grid;
       finer_grids.insert(std::make_pair(&rhs(i), &rhs(i+1)));
@@ -281 +278 @@
 {
   MPI_Comm comm = CommunicatorGlobal(grid_old);
-  bool dt_is_new = true;
 
   // Insert into map
@@ -287 +283 @@
       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;
+  bool dt_is_new = insert_result.second;
 
 
@@ -336 +332 @@
           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,
+              begin - grid_new.Global().LocalBegin() + offset_new,
               i, 0, 0, true));
         }
@@ -370 +366 @@
           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,
+              begin - grid_old.Global().LocalBegin() + offset_old,
               i, 0, 0, true));
         }