Changeset f57182 for src/comm/comm_mpi.cpp

Timestamp:

Mar 30, 2013, 2:44:52 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

8180d8

Parents:

d13e27

git-author:

Julian Iseringhausen <isering@…> (06/11/12 14:02:16)

git-committer:

Julian Iseringhausen <isering@…> (03/30/13 14:44:52)

Message:

Open boundary conditions.

Conflicts:

lib/vmg/src/Makefile.am
lib/vmg/src/base/factory.cpp
lib/vmg/test/unit_test/library/dirichlet_fas_lr_mpi.cpp

File:

• src/comm/comm_mpi.cpp (modified) (3 diffs)

src/comm/comm_mpi.cpp

@@ -487 +487 @@
           << "    GLOBAL_FINER_END:   " << grid.Global().GlobalFinerEnd() << std::endl
           << "    GLOBAL_FINER_SIZE:  " << grid.Global().GlobalFinerSize() << std::endl
-          << "    FINEST_ABS_BEGIN:   " << grid.Global().FinestAbsBegin() << std::endl
-          << "    FINEST_ABS_END:     " << grid.Global().FinestAbsEnd() << std::endl
-          << "    FINEST_ABS_SIZE:    " << grid.Global().FinestAbsSize() << std::endl
           << "    GLOBAL_SIZE:        " << grid.Global().GlobalSize() << std::endl
           << "  EXTENT:" << std::endl
@@ -577 +574 @@
   if (settings.CommunicatorLocal(grid) != MPI_COMM_NULL) {
 
-    Index end, end_global;
-
-    for (int i=0; i<3; ++i) {
-      end[i] = grid.Local().End()[i];
-      end_global[i] = grid.Global().LocalEnd()[i];
-    }
-
     vtkSmartPointer<vtkImageData> image = vtkSmartPointer<vtkImageData>::New();
-    image->SetExtent(grid.Global().LocalBegin().X(), end_global.X()-1,
-                     grid.Global().LocalBegin().Y(), end_global.Y()-1,
-                     grid.Global().LocalBegin().Z(), end_global.Z()-1);
+    image->SetExtent(grid.Global().LocalBegin().X(), grid.Global().LocalEnd().X()-1,
+                     grid.Global().LocalBegin().Y(), grid.Global().LocalEnd().Y()-1,
+                     grid.Global().LocalBegin().Z(), grid.Global().LocalEnd().Z()-1);
     image->SetSpacing(grid.Extent().MeshWidth().vec());
     image->SetOrigin(grid.Extent().Begin().vec());
@@ -595 +585 @@
     image->GetPointData()->GetScalars()->SetName(information);
 
-    Index i;
-    for (i.X()=grid.Local().Begin().X(); i.X()<end.X(); ++i.X())
-      for (i.Y()=grid.Local().Begin().Y(); i.Y()<end.Y(); ++i.Y())
-        for (i.Z()=grid.Local().Begin().Z(); i.Z()<end.Z(); ++i.Z())
-          image->SetScalarComponentFromDouble(i.X() - grid.Local().Begin().X() + grid.Global().LocalBegin().X(),
-                                              i.Y() - grid.Local().Begin().Y() + grid.Global().LocalBegin().Y(),
-                                              i.Z() - grid.Local().Begin().Z() + grid.Global().LocalBegin().Z(),
+    Index begin, end, i;
+    for (int j=0; j<3; ++j) {
+      begin[j] = (grid.Local().BoundarySize1()[j] > 0 ? grid.Local().BoundaryBegin1()[j] : grid.Local().Begin()[j]);
+      end[j] = (grid.Local().BoundarySize2()[j] > 0 ? grid.Local().BoundaryEnd2()[j] : grid.Local().End()[j]);
+    }
+
+    for (i.X() = begin.X(); i.X() < end.X(); ++i.X())
+      for (i.Y() = begin.Y(); i.Y() < end.Y(); ++i.Y())
+        for (i.Z() = begin.Z(); i.Z() < end.Z(); ++i.Z())
+          image->SetScalarComponentFromDouble(i.X() - begin.X() + grid.Global().LocalBegin().X(),
+                                              i.Y() - begin.Y() + grid.Global().LocalBegin().Y(),
+                                              i.Z() - begin.Z() + grid.Global().LocalBegin().Z(),
                                               0, grid.GetVal(i));