Changeset 6e10f33 for src/grid/multigrid.cpp

Timestamp:

Apr 12, 2013, 8:41:41 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

e5d779b

Parents:

b3075a

Message:

Some work...

File:

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

src/grid/multigrid.cpp

@@ -82 +82 @@
       for (int j=0; j<3; ++j) {
 
-        if (comm->BoundaryConditions()[j] == Dirichlet ||
-            comm->BoundaryConditions()[j] == Open) {
-
-          local_l.SizeTotal()[j] = global_separated[i].LocalSize()[j];
-
-          /*
-           * We have a boundary at the ends of the process grids
-           * and halo grid points otherwise
-           */
-          if (global_separated[i].LocalBegin()[j] == 0) {
-            local_l.BoundaryBegin1()[j] = 0;
-            local_l.BoundaryEnd1()[j] = 1;
-          }else {
-            ++local_l.SizeTotal()[j];
-            local_l.HaloBegin1()[j] = 0;
-            local_l.HaloEnd1()[j] = 1;
-          }
-
-          if (global_separated[i].LocalEnd()[j] == global_separated[i].GlobalEnd()[j]) {
-            local_l.BoundaryBegin2()[j] = local_l.SizeTotal()[j] - 1;
-            local_l.BoundaryEnd2()[j] = local_l.SizeTotal()[j];
-          }else {
-            ++local_l.SizeTotal()[j];
-            local_l.HaloBegin2()[j] = local_l.SizeTotal()[j] - 1;
-            local_l.HaloEnd2()[j] = local_l.SizeTotal()[j];
-          }
-
-        }else if (comm->BoundaryConditions()[j] == Periodic) {
-
-          local_l.SizeTotal()[j] = global_separated[i].LocalSize()[j] + 2;
-
-          /*
-           * No boundary
-           */
-          local_l.BoundaryBegin1()[j] = local_l.BoundaryEnd1()[j] = 0;
-          local_l.BoundaryBegin2()[j] = local_l.BoundaryEnd2()[j] = 0;
-
-          /*
-           * Halo grid points on all processes
-           */
-          local_l.HaloBegin1()[j] = 0;
-          local_l.HaloEnd1()[j] = 1;
-          local_l.HaloBegin2()[j] = local_l.SizeTotal()[j] - 1;
-          local_l.HaloEnd2()[j] = local_l.SizeTotal()[j];
-
-        }
+        if (comm->BoundaryConditions()[j] == Dirichlet ||
+            comm->BoundaryConditions()[j] == Open) {
+
+          local_l.SizeTotal()[j] = global_separated[i].LocalSize()[j];
+
+          /*
+           * We have a boundary at the ends of the process grids
+           * and halo grid points otherwise
+           */
+          if (global_separated[i].LocalBegin()[j] == global_separated[i].GlobalBegin()[j]) {
+            local_l.BoundaryBegin1()[j] = 0;
+            local_l.BoundaryEnd1()[j] = 1;
+          }else {
+            ++local_l.SizeTotal()[j];
+            local_l.HaloBegin1()[j] = 0;
+            local_l.HaloEnd1()[j] = 1;
+          }
+
+          if (global_separated[i].LocalEnd()[j] == global_separated[i].GlobalEnd()[j]) {
+            local_l.BoundaryBegin2()[j] = local_l.SizeTotal()[j] - 1;
+            local_l.BoundaryEnd2()[j] = local_l.SizeTotal()[j];
+          }else {
+            ++local_l.SizeTotal()[j];
+            local_l.HaloBegin2()[j] = local_l.SizeTotal()[j] - 1;
+            local_l.HaloEnd2()[j] = local_l.SizeTotal()[j];
+          }
+
+        }else if (comm->BoundaryConditions()[j] == Periodic) {
+
+          local_l.SizeTotal()[j] = global_separated[i].LocalSize()[j] + 2;
+
+          /*
+           * No boundary
+           */
+          local_l.BoundaryBegin1()[j] = local_l.BoundaryEnd1()[j] = 0;
+          local_l.BoundaryBegin2()[j] = local_l.BoundaryEnd2()[j] = 0;
+
+          /*
+           * Halo grid points on all processes
+           */
+          local_l.HaloBegin1()[j] = 0;
+          local_l.HaloEnd1()[j] = 1;
+          local_l.HaloBegin2()[j] = local_l.SizeTotal()[j] - 1;
+          local_l.HaloEnd2()[j] = local_l.SizeTotal()[j];
+
+        }
 
       }
@@ -223 +223 @@
     for (i_c.Y()=grid_c.Local().Begin().Y(); i_c.Y()<grid_c.Local().End().Y(); ++i_c.Y())
       for (i_c.Z()=grid_c.Local().Begin().Z(); i_c.Z()<grid_c.Local().End().Z(); ++i_c.Z())
-        grid_c(i_c) = grid_f.GetVal(i_f.X(), 2*i_c.Y(), 2*i_c.Z());
+        grid_c(i_c) = grid_f.GetVal(i_f.X(), 2*i_c.Y(), 2*i_c.Z());
 
     i_c.X() = grid_c.Local().BoundaryBegin2().X();
@@ -229 +229 @@
     for (i_c.Y()=grid_c.Local().Begin().Y(); i_c.Y()<grid_c.Local().End().Y(); ++i_c.Y())
       for (i_c.Z()=grid_c.Local().Begin().Z(); i_c.Z()<grid_c.Local().End().Z(); ++i_c.Z())
-        grid_c(i_c) = grid_f.GetVal(i_f.X(), 2*i_c.Y(), 2*i_c.Z());
+        grid_c(i_c) = grid_f.GetVal(i_f.X(), 2*i_c.Y(), 2*i_c.Z());
 
     i_c.Y() = grid_c.Local().BoundaryBegin1().Y();
@@ -235 +235 @@
     for (i_c.X()=0; i_c.X()<grid_c.Local().SizeTotal().X(); ++i_c.X())
       for (i_c.Z()=grid_c.Local().Begin().Z(); i_c.Z()<grid_c.Local().End().Z(); ++i_c.Z())
-        grid_c(i_c) = grid_f.GetVal(2*i_c.X(), i_f.Y(), 2*i_c.Z());
+        grid_c(i_c) = grid_f.GetVal(2*i_c.X(), i_f.Y(), 2*i_c.Z());
 
     i_c.Y() = grid_c.Local().BoundaryBegin2().Y();
@@ -241 +241 @@
     for (i_c.X()=0; i_c.X()<grid_c.Local().SizeTotal().X(); ++i_c.X())
       for (i_c.Z()=grid_c.Local().Begin().Z(); i_c.Z()<grid_c.Local().End().Z(); ++i_c.Z())
-        grid_c(i_c) = grid_f.GetVal(2*i_c.X(), i_f.Y(), 2*i_c.Z());
+        grid_c(i_c) = grid_f.GetVal(2*i_c.X(), i_f.Y(), 2*i_c.Z());
 
     i_c.Z() = grid_c.Local().BoundaryBegin1().Z();
@@ -247 +247 @@
     for (i_c.X()=0; i_c.X()<grid_c.Local().SizeTotal().X(); ++i_c.X())
       for (i_c.Y()=0; i_c.Y()<grid_c.Local().SizeTotal().Y(); ++i_c.Y())
-        grid_c(i_c) = grid_f.GetVal(2*i_c.X(), 2*i_c.Y(), i_f.Z());
+        grid_c(i_c) = grid_f.GetVal(2*i_c.X(), 2*i_c.Y(), i_f.Z());
 
     i_c.Z() = grid_c.Local().BoundaryBegin2().Z();
@@ -253 +253 @@
     for (i_c.X()=0; i_c.X()<grid_c.Local().SizeTotal().X(); ++i_c.X())
       for (i_c.Y()=0; i_c.Y()<grid_c.Local().SizeTotal().Y(); ++i_c.Y())
-        grid_c(i_c) = grid_f.GetVal(2*i_c.X(), 2*i_c.Y(), i_f.Z());
+        grid_c(i_c) = grid_f.GetVal(2*i_c.X(), 2*i_c.Y(), i_f.Z());
 
   }