Changeset 534af9 for src/comm/comm.cpp

Timestamp:

Apr 20, 2013, 1:52:38 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

881e4b

Parents:

032852

Message:

Adapted Comm::GetParticleGrid to open boundary conditions.

File:

• src/comm/comm.cpp (modified) (2 diffs)

src/comm/comm.cpp

@@ -89 +89 @@
     return *particle_grid;
 
-  const Multigrid& multigrid = *MG::GetRhs();
-  const Grid& grid = multigrid(multigrid.MaxLevel());
+  const Grid& grid = (*MG::GetRhs())(MG::GetRhs()->MaxLevel());
+
   LocalIndices local = grid.Local();
+  GlobalIndices global = grid.Global();
+  SpatialExtent extent = grid.Extent();
 
   const int& near_field_cells = MG::GetFactory().GetObjectStorageVal<int>("PARTICLE_NEAR_FIELD_CELLS");
 
-  local.BoundaryBegin1() = 0;
-  local.BoundaryEnd1() = 0;
-  local.BoundarySize1() = 0;
+  for (int i=0; i<3; ++i) {
 
-  local.BoundaryBegin2() = 0;
-  local.BoundaryEnd2() = 0;
-  local.BoundarySize2() = 0;
+    if (BoundaryConditions()[i] == Open || BoundaryConditions()[i] == Dirichlet) {
+
+      if (global.LocalBegin()[i] == global.GlobalBegin()[i])
+        global.LocalBegin()[i] += 1;
+
+      if (global.LocalEnd()[i] == global.GlobalEnd()[i])
+        global.LocalEnd()[i] -= 1;
+
+      global.LocalSize()[i] = global.LocalEnd()[i] - global.LocalBegin()[i];
+
+      global.GlobalBegin()[i] += 1;
+      global.GlobalEnd()[i] -= 1;
+      global.GlobalSize()[i] = global.GlobalEnd()[i] - global.GlobalBegin()[i];
+
+      extent.Begin()[i] += extent.MeshWidth()[i];
+      extent.End()[i] -= extent.MeshWidth()[i];
+      extent.Size()[i] = extent.End()[i] - extent.Begin()[i];
+
+    }
+
+  }
+
+  local.BoundaryBegin1() = local.BoundaryEnd1() = local.BoundarySize1() = 0;
+  local.BoundaryBegin2() = local.BoundaryEnd2() = local.BoundarySize2() = 0;
 
   local.End() -= local.Begin();
@@ -127 +148 @@
   local.SizeTotal() = local.Size() + local.HaloSize1() + local.HaloSize2();
 
-  particle_grid = new Grid(grid.Global(), local, grid.Extent());
+  particle_grid = new Grid(global, local, extent);
 
   return *particle_grid;