Changeset d6a338 for src/grid/multigrid.cpp

Timestamp:

Apr 16, 2013, 11:27:31 AM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

177495

Parents:

e58835d

Message:

Save the whole domain decomposition instead of just the part for the current process.

File:

• src/grid/multigrid.cpp (modified) (5 diffs)

src/grid/multigrid.cpp

@@ -43 +43 @@
 using namespace VMG;
 
-Multigrid::Multigrid(Comm* comm, const Interface* interface)
+Multigrid::Multigrid(const Comm& comm, const Interface& interface)
 {
   Index points, remainder;
   LocalIndices local_l;
-  std::vector<GlobalIndices> global_separated;
-
-  const std::vector<GlobalIndices>& global = interface->Global();
-  const std::vector<SpatialExtent>& extent = interface->Extent();
-
-  comm->GetDomainDecomposition().Compute(comm, interface, global_separated);
-
-  for (unsigned int i=0; i<global.size(); ++i) {
+
+  const std::vector<SpatialExtent>& extent = interface.Extent();
+  const std::vector<GlobalIndices>& global_separated = comm.DecomposedGlobalMe();
+
+  for (unsigned int i=0; i<global_separated.size(); ++i) {
 
     /*
      * Check if this level is the finest global level
      */
-    if (global[i].BoundaryType() == GlobalMax)
-      levelGlobalMax = interface->MaxLevel() - i;
-
+    if (global_separated[i].BoundaryType() == GlobalMax)
+      levelGlobalMax = interface.MaxLevel() - i;
 
     if (global_separated[i].LocalSize().Product() > 0) {
@@ -82 +78 @@
       for (int j=0; j<3; ++j) {
 
-        if (comm->BoundaryConditions()[j] == Dirichlet ||
-            comm->BoundaryConditions()[j] == Open) {
+        if (comm.BoundaryConditions()[j] == Dirichlet ||
+            comm.BoundaryConditions()[j] == Open) {
 
           local_l.SizeTotal()[j] = global_separated[i].LocalSize()[j];
@@ -109 +105 @@
           }
 
-        }else if (comm->BoundaryConditions()[j] == Periodic) {
+        }else if (comm.BoundaryConditions()[j] == Periodic) {
 
           local_l.SizeTotal()[j] = global_separated[i].LocalSize()[j] + 2;
@@ -161 +157 @@
     }
 
-    grids.push_back(new Grid(global_separated[i], local_l, extent[i], interface->MaxLevel()-i, this));
+    grids.push_back(new Grid(global_separated[i], local_l, extent[i], interface.MaxLevel()-i, this));
 
   }
@@ -167 +163 @@
   numLevels = grids.size();
 
-  levelMax = interface->MaxLevel();
+  levelMax = interface.MaxLevel();
   levelMin = levelMax - numLevels + 1;