Changeset 8180d8 for src/base/interface.cpp

Timestamp:

Apr 5, 2013, 12:39:30 PM (13 years ago)

Author:

Julian Iseringhausen <julian.iseringhausen@…>

Children:

4a709e

Parents:

f57182

Message:

Merge stashed open boundary stuff.

File:

• src/base/interface.cpp (modified) (2 diffs)

src/base/interface.cpp

@@ -48 +48 @@
 {
   int i;
-  Index size_factor;
+  Index num_cells, size_factor;
+  Index add_node = Index(bc[0]==Periodic?0:1,
+                                         bc[1]==Periodic?0:1,
+                                         bc[2]==Periodic?0:1);
 
   const Vector box_center = box_offset + 0.5 * box_size;
@@ -56 +59 @@
    */
   for (i=0; i<coarseningSteps; ++i) {
+
+    for (int j=0; j<3; ++j)
+      size_factor[j] = (bc[j] == Open ? Helper::intpow(2, static_cast<int>(log(pow(alpha, i+1)) / log(2.0) + 1.0)) : 1);
+
+    num_cells = Helper::intpow(2,levelMax-i) * size_factor;
+
+    global.push_back(GlobalIndices());
     extent.push_back(SpatialExtent());
-    for (int j=0; j<3; ++j)
-      size_factor[j] = (bc[j] == Periodic ? 1 : Helper::intpow(2, static_cast<int>(log(pow(alpha, i+1)) / log(2.0) + 1.0)));
 
     extent.back().Size() = box_size * static_cast<Vector>(size_factor);
     extent.back().Begin() = box_center - 0.5 * extent.back().Size();
     extent.back().End() = extent.back().Begin() + extent.back().Size();
-    extent.back().MeshWidth() = pow(2.0, i-levelMax) * extent.back().Size() / size_factor;
+    extent.back().MeshWidth() = extent.back().Size() / num_cells;
+
+    global.back().LocalSize() = num_cells + add_node;
+    global.back().LocalBegin() = -1 * num_cells / 2;
+    global.back().LocalEnd() = num_cells/2 + add_node;
+
+    global.back().GlobalSizeNew() = global.back().LocalSize();
+    global.back().GlobalBegin() = global.back().LocalBegin();
+    global.back().GlobalEnd() = global.back().LocalEnd();
+
+    global.back().GlobalSizeFinest() = Helper::intpow(2, coarseningSteps)*num_cells + add_node;
+    global.back().GlobalBeginFinest() = -1 * ((Helper::intpow(2, coarseningSteps)*num_cells) / 2);
+    global.back().GlobalEndFinest() = (Helper::intpow(2, coarseningSteps)*num_cells) / 2 + add_node;
+
   }
 
-  if (extent.size() == 0) {
-    extent.push_back(SpatialExtent());
-    extent.back().Size() = box_size;
-    extent.back().Begin() = box_offset;
-    extent.back().End() = box_offset + box_size;
-    extent.back().MeshWidth() = box_size / Helper::intpow(2,levelMax);
+  if (coarseningSteps == 0) {
+
+          num_cells = Helper::intpow(2, levelMax);
+
+          global.push_back(GlobalIndices());
+          extent.push_back(SpatialExtent());
+
+          extent.back().Size() = box_size;
+          extent.back().Begin() = box_center - 0.5 * extent.back().Size();
+          extent.back().End() = extent.back().Begin() + extent.back().Size();
+          extent.back().MeshWidth() = extent.back().Size() / num_cells;
+
+          global.back().LocalSize() = num_cells + add_node;
+          global.back().LocalBegin() = -1 * num_cells/2;
+          global.back().LocalEnd() = num_cells/2 + add_node;
+
+          global.back().GlobalSizeNew() = global.back().LocalSize();
+          global.back().GlobalBegin() = global.back().LocalBegin();
+          global.back().GlobalEnd() = global.back().LocalEnd();
+
+          global.back().GlobalSizeFinest() = global.back().LocalSize();
+          global.back().GlobalBeginFinest() = global.back().LocalBegin();
+          global.back().GlobalEndFinest() = global.back().LocalEnd();
+
   }
 
-  while ((extent.back().Size() / extent.back().MeshWidth()).Min() > Helper::intpow(2,levelMin) + 1) {
-    extent.push_back(SpatialExtent(extent.back()));
-    extent.back().MeshWidth() *= 2;
-  }
+  while (global.back().LocalSize().Min() > Helper::intpow(2, levelMin)+1) {
 
-  /*
-   * Find GlobalMax
-   */
-  for (std::vector<SpatialExtent>::const_iterator iter=extent.begin(); iter!=extent.end(); ++iter) {
-    global.push_back(GlobalIndices());
-    global.back().BoundaryType() = GlobalCoarsened;
-  }
+    num_cells /= 2;
 
-  for (i=global.size()-1; i>=0; --i) {
-    if (i == 0 || extent[i-1].Size() != extent[i].Size()) {
-      global[i].BoundaryType() = GlobalMax;
+    extent.back().Size() = (++extent.rbegin())->Size();
+    extent.back().Begin() = (++extent.rbegin())->Begin();
+    extent.back().End() = (++extent.rbegin())->End();
+    extent.back().MeshWidth() = 2.0 * (++extent.rbegin())->MeshWidth();
+
+    global.back().LocalSize() = num_cells + add_node;
+    global.back().LocalBegin() = -1 * num_cells/2;
+    global.back().LocalEnd() = num_cells/2 + add_node;
+
+    global.back().GlobalSizeNew() = global.back().LocalSize();
+    global.back().GlobalBegin() = global.back().LocalBegin();
+    global.back().GlobalEnd() = global.back().LocalEnd();
+
+    global.back().GlobalSizeFinest() = (++global.rbegin())->GlobalSizeFinest();
+    global.back().GlobalBeginFinest() = (++global.rbegin())->GlobalBeginFinest();
+    global.back().GlobalEndFinest() = (++global.rbegin())->GlobalEndFinest();
+  }     
+
+  for (i=global.size()-2; i>=0; --i) {
+    if (global[i].GlobalSizeFinest().Product() >= global[i+1].GlobalSizeFinest().Product()) {
+      global[i].BoundaryType() = GlobalCoarsened;
+    }else {
+      global[i].BoundaryType() = LocallyRefined;
+      global[i+1].BoundaryType() = GlobalMax;
       break;
     }
   }
-  for (--i; i>=0; --i)
-    global[i].BoundaryType() = LocallyRefined;
-
-  /*
-   * Compute global grid values
-   */
-  for (i=0; i<global.size(); ++i) {
-
-    const Index num_cells = extent[i].Size() / extent[i].MeshWidth() + 0.5;
-
-    for (int j=0; j<3; ++j) {
-
-      if (bc[j] == Dirichlet || bc[j] == Open) {
-        /*
-         * Dirichlet
-         */
-
-        if (global[i].BoundaryType() == LocallyRefined) {
-          /*
-           * Locally Refined
-           */
-
-          global[i].GlobalSize()[j] = num_cells[j] + 3;
-
-          if (i == 0) {
-            global[i].GlobalFinerBegin()[j] = GetGlobalIndex(box_offset, extent[i], global[i].BoundaryType())[j];
-            global[i].GlobalFinerEnd()[j] = GetGlobalIndex(box_offset + box_size, extent[i], global[i].BoundaryType())[j] + 1;
-            global[i].GlobalFinerSize()[j] = global[i].GlobalFinerEnd()[j] - global[i].GlobalFinerBegin()[j];
-          } else {
-            global[i].GlobalFinerBegin()[j] = GetGlobalIndex(extent[i-1].Begin(), extent[i], global[i].BoundaryType())[j];
-            global[i].GlobalFinerEnd()[j] = GetGlobalIndex(extent[i-1].End(), extent[i], global[i].BoundaryType())[j] + 1;
-            global[i].GlobalFinerSize()[j] = global[i].GlobalFinerEnd()[j] - global[i].GlobalFinerBegin()[j];
-          }
-
-        } else if (global[i].BoundaryType() == GlobalMax) {
-          /*
-           * Global Max
-           */
-
-          global[i].GlobalSize()[j] = num_cells[j] + 1;
-
-          if (i == 0) {
-            global[i].GlobalFinerBegin()[j] = 0;
-            global[i].GlobalFinerEnd()[j] = num_cells[j] + 1;
-            global[i].GlobalFinerSize()[j] = num_cells[j] + 1;
-          } else {
-            global[i].GlobalFinerBegin()[j] = GetGlobalIndex(extent[i-1].Begin(), extent[i], global[i].BoundaryType())[j];
-            global[i].GlobalFinerEnd()[j] = GetGlobalIndex(extent[i-1].End(), extent[i], global[i].BoundaryType())[j] + 1;
-            global[i].GlobalFinerSize()[j] = global[i].GlobalFinerEnd()[j] - global[i].GlobalFinerBegin()[j];
-          }
-
-        } else {
-          /*
-           * Global Coarsened
-           */
-
-          global[i].GlobalSize()[j] = num_cells[j] + 1;
-
-          global[i].GlobalFinerBegin()[j] = 0;
-          global[i].GlobalFinerEnd()[j] = num_cells[j] + 1;
-          global[i].GlobalFinerSize()[j] = num_cells[j] + 1;
-
-        }
-
-      } else if (bc[j] == Periodic) {
-        /*
-         * Periodic
-         */
-
-        global[i].GlobalSize()[j] = num_cells[j];
-
-        global[i].GlobalFinerBegin()[j] = 0;
-        global[i].GlobalFinerEnd()[j] = num_cells[j];
-        global[i].GlobalFinerSize()[j] = num_cells[j];
-
-      }
-    }
-
-    global[i].LocalBegin() = 0;
-    global[i].LocalEnd() = global[i].GlobalSize();
-    global[i].LocalSize() = global[i].GlobalSize();
-
-    global[i].LocalFinerBegin() = global[i].GlobalFinerBegin();
-    global[i].LocalFinerEnd() = global[i].GlobalFinerEnd();
-    global[i].LocalFinerSize() = global[i].GlobalFinerSize();
-
-  }
 
   levelMin = levelMax - global.size() + 1;
-
 }