Changeset ac6d04 for src/comm/comm.cpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

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

File:

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

src/comm/comm.cpp

@@ -57 +57 @@
   }
 
-  norm = sqrt( Helper::pow_3(sol().MeshWidth()) * GlobalSum(norm) );
+  norm = sqrt(sol().Extent().MeshWidth().Product() * GlobalSum(norm));
 
   return norm;
@@ -68 +68 @@
 
   const Multigrid& multigrid = *MG::GetRhs();
-  const Grid& grid = multigrid(multigrid.GlobalMaxLevel());
+  const Grid& grid = multigrid(multigrid.MaxLevel());
   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.BoundaryBegin1() = 0;
+  local.BoundaryEnd1() = 0;
+  local.BoundarySize1() = 0;
+
+  local.BoundaryBegin2() = 0;
+  local.BoundaryEnd2() = 0;
+  local.BoundarySize2() = 0;
+
+  local.FinerBeginFoo() = 0;
+  local.FinerEndFoo() = 0;
+  local.FinerSizeFoo() = 0;
+
   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]) {
+    if (local.HaloSize1()[i] > 0) {
       local.HaloBegin1()[i] = 0;
-      local.HaloEnd1()[i] = local.Begin()[i] = near_field_cells+1;
+      local.HaloEnd1()[i] = near_field_cells;
+      local.HaloSize1()[i] = near_field_cells;
+      local.Begin()[i] = near_field_cells;
       local.End()[i] = local.Begin()[i] + local.Size()[i];
     }
 
-    if (local.HasHalo2()[i]) {
+    if (local.HaloSize2()[i] > 0) {
       local.HaloBegin2()[i] = local.End()[i];
-      local.HaloEnd2()[i] = local.HaloBegin2()[i] + near_field_cells+1;
+      local.HaloEnd2()[i] = local.HaloBegin2()[i] + near_field_cells;
+      local.HaloSize2()[i] = near_field_cells;
     }
 
   }
 
-  local.SizeTotal() = local.Size() +
-                      local.HaloEnd1() - local.HaloBegin1() +
-                      local.HaloEnd2() - local.HaloBegin2();
+  local.SizeTotal() = local.Size() + local.HaloSize1() + local.HaloSize2();
 
   particle_grid = new Grid(grid.Global(), local, grid.Extent());