Changeset 894a5f for src/comm/comm.cpp

Timestamp:

Feb 2, 2012, 1:58:12 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

32ff22

Parents:

01be70

Message:

Parallel performance update.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1314 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

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

src/comm/comm.cpp

@@ -49 +49 @@
 
   for (grid_iter=rhs().Iterators().Local().Begin(); grid_iter!=rhs().Iterators().Local().End(); ++grid_iter) {
-
     val = rhs().GetVal(*grid_iter) - prefactor * A.GetDiag() * sol().GetVal(*grid_iter);
-
     for (stencil_iter=A.begin(); stencil_iter!=A.end(); ++stencil_iter)
-      val -= prefactor * stencil_iter->Val() * sol().GetVal(*grid_iter + stencil_iter->Disp());
-
+      val -= prefactor * stencil_iter->Val() * sol().GetVal(grid_iter->X() + stencil_iter->Disp().X(),
+                                                            grid_iter->Y() + stencil_iter->Disp().Y(),
+                                                            grid_iter->Z() + stencil_iter->Disp().Z());
     norm += val*val;
-
   }
 
@@ -64 +62 @@
 }
 
-void Comm::InitComm()
+Grid& Comm::GetParticleGrid()
 {
+  if (particle_grid != NULL)
+    return *particle_grid;
+
+  const Multigrid& multigrid = *MG::GetRhs();
+  const Grid& grid = multigrid(multigrid.GlobalMaxLevel());
+  LocalIndices local = grid.Local();
+
+  const int& near_field_cells = MG::GetFactory().GetObjectStorageVal<int>("PARTICLE_NEAR_FIELD_CELLS");
+
+  // We don't need a boundary on this grid
+  local.End() -= local.Begin();
+  local.Begin() = 0;
+  local.BoundaryBegin1() = local.BoundaryEnd1() = 0;
+  local.BoundaryBegin2() = local.BoundaryEnd2() = 0;
+
+  // Set grid size of intermediate temporary grid
+  for (int i=0; i<3; ++i) {
+
+    if (local.HasHalo1()[i]) {
+      local.HaloBegin1()[i] = 0;
+      local.HaloEnd1()[i] = local.Begin()[i] = near_field_cells+1;
+      local.End()[i] = local.Begin()[i] + local.Size()[i];
+    }
+
+    if (local.HasHalo2()[i]) {
+      local.HaloBegin2()[i] = local.End()[i];
+      local.HaloEnd2()[i] = local.HaloBegin2()[i] + near_field_cells+1;
+    }
+
+  }
+
+  local.SizeTotal() = local.Size() +
+                      local.HaloEnd1() - local.HaloBegin1() +
+                      local.HaloEnd2() - local.HaloBegin2();
+
+  particle_grid = new Grid(grid.Global(), local, grid.Extent());
+
+  return *particle_grid;
 }
 
@@ -71 +107 @@
 {
   delete dd;
+  delete particle_grid;
 }