Changeset ac6d04 for src/grid/multigrid.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/grid/multigrid.cpp (modified) (6 diffs)

src/grid/multigrid.cpp

@@ -45 +45 @@
 
 
-    if (global_separated[i].SizeLocal().Product() > 0) {
+    if (global_separated[i].LocalSize().Product() > 0) {
 
       /*
        * Initialize some properties with zero
        */
-      local_l.HaloBegin1() = local_l.HaloEnd1() = 0;
-      local_l.HaloBegin2() = local_l.HaloEnd2() = 0;
-      local_l.BoundaryBegin1() = local_l.BoundaryEnd1() = 0;
-      local_l.BoundaryBegin2() = local_l.BoundaryEnd2() = 0;
+      local_l.HaloBegin1() = 0;
+      local_l.HaloEnd1() = 0;
+      local_l.HaloBegin2() = 0;
+      local_l.HaloEnd2() = 0;
+      local_l.BoundaryBegin1() = 0;
+      local_l.BoundaryEnd1() = 0;
+      local_l.BoundaryBegin2() = 0;
+      local_l.BoundaryEnd2() = 0;
 
       /*
@@ -63 +67 @@
             comm->BoundaryConditions()[j] == Open) {
 
-          local_l.SizeTotal()[j] = global_separated[i].SizeLocal()[j] +
+          local_l.SizeTotal()[j] = global_separated[i].LocalSize()[j] +
             (global_separated[i].BoundaryType() == LocallyRefined ? 2 : 0);
 
@@ -70 +74 @@
            * and halo grid points otherwise
            */
-          if (global_separated[i].BeginLocal()[j] == 0) {
+          if (global_separated[i].LocalBegin()[j] == 0) {
             local_l.BoundaryBegin1()[j] = 0;
             local_l.BoundaryEnd1()[j] = 1;
@@ -79 +83 @@
           }
 
-          if (global_separated[i].EndLocal()[j] == global_separated[i].SizeGlobal()[j]) {
+          if (global_separated[i].LocalEnd()[j] == global_separated[i].GlobalSize()[j]) {
             local_l.BoundaryBegin2()[j] = local_l.SizeTotal()[j] - 1;
             local_l.BoundaryEnd2()[j] = local_l.SizeTotal()[j];
@@ -90 +94 @@
         }else if (comm->BoundaryConditions()[j] == Periodic) {
 
-          local_l.SizeTotal()[j] = global_separated[i].SizeLocal()[j] + 2;
+          local_l.SizeTotal()[j] = global_separated[i].LocalSize()[j] + 2;
 
           /*
@@ -114 +118 @@
 
       local_l.Size() = local_l.End() - local_l.Begin();
-
-      if (i==0)
-        local_l.AlignmentBegin() = (global_separated[i].SizeGlobal() - static_cast<int>( pow(2.0, interface->MaxLevel() ) + 0.5 ) - 1) / 2;
-      else if (global_separated[i].BoundaryType() == LocallyRefined)
-        local_l.AlignmentBegin() = (extent[i].Size() - extent[i-1].Size()) * pow(2.0, interface->MaxLevel()-i-1) + 0.5;
-      else if (global_separated[i].BoundaryType() == GlobalMax)
-        local_l.AlignmentBegin() = (extent[i].Size() - extent[i-1].Size()) * pow(2.0, interface->MaxLevel()-i-1) - 0.5;
-      else
-        local_l.AlignmentBegin() = 0;
-
-      local_l.AlignmentBegin() += local_l.Begin();
-      local_l.AlignmentEnd() = local_l.AlignmentBegin() + global_separated[i].SizeLocal();
-
-      local_l.AlignmentBegin().Clamp(local_l.Begin(), local_l.End());
-      local_l.AlignmentEnd().Clamp(local_l.Begin(), local_l.End());
-
-
-      grids.push_back(new Grid(global_separated[i], local_l, extent[i], interface->MaxLevel()-i, this));
+      local_l.HaloSize1() = local_l.HaloEnd1() - local_l.HaloBegin1();
+      local_l.HaloSize2() = local_l.HaloEnd2() - local_l.HaloBegin2();
+      local_l.BoundarySize1() = local_l.BoundaryEnd1() - local_l.BoundaryBegin1();
+      local_l.BoundarySize2() = local_l.BoundaryEnd2() - local_l.BoundaryBegin2();
+
+      local_l.FinerSizeFoo() = global_separated[i].LocalFinerSize() - local_l.BoundarySize1() - local_l.BoundarySize2();
+      local_l.FinerBeginFoo() = global_separated[i].LocalFinerBegin() - global_separated[i].LocalBegin() + local_l.Begin();
+      local_l.FinerEndFoo() = local_l.FinerBeginFoo() + local_l.FinerSizeFoo();
+
 
     }else {
 
-      global_separated[i].SizeGlobal() = global[i].SizeGlobal();
-      global_separated[i].BeginFinest() = global[i].BeginFinest();
-      global_separated[i].EndFinest() = global[i].EndFinest();
-      global_separated[i].SizeFinest() = global[i].SizeFinest();
-      global_separated[i].SizeLocal() = 0;
-      global_separated[i].BeginLocal() = 0;
-      global_separated[i].EndLocal() = 0;
-      global_separated[i].BoundaryType() = global[i].BoundaryType();
-
+      local_l.Begin() = 0;
+      local_l.End() = 0;
       local_l.Size() = 0;
       local_l.SizeTotal() = 0;
-      local_l.Begin() = 0;
-      local_l.End() = 0;
       local_l.HaloBegin1() = 0;
+      local_l.HaloEnd1() = 0;
+      local_l.HaloSize1() = 0;
       local_l.HaloBegin2() = 0;
-      local_l.HaloEnd1() = 0;
       local_l.HaloEnd2() = 0;
+      local_l.HaloSize2() = 0;
       local_l.BoundaryBegin1() = 0;
+      local_l.BoundaryEnd1() = 0;
+      local_l.BoundarySize1() = 0;
       local_l.BoundaryBegin2() = 0;
-      local_l.BoundaryEnd1() = 0;
       local_l.BoundaryEnd2() = 0;
-      local_l.AlignmentBegin() = 0;
-      local_l.AlignmentEnd() = 0;
-
-      grids.push_back(new Grid(global_separated[i], local_l, extent[i], interface->MaxLevel()-i, this));
+      local_l.BoundarySize2() = 0;
+      local_l.FinerBeginFoo() = 0;
+      local_l.FinerEndFoo() = 0;
+      local_l.FinerSizeFoo() = 0;
 
     }
+
+    grids.push_back(new Grid(global_separated[i], local_l, extent[i], interface->MaxLevel()-i, this));
+
   }