Changeset dfed1c for src/interface/interface.cpp

Timestamp:

Nov 22, 2011, 9:22:10 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

facba0

Parents:

66f24d

Message:

Major vmg update.

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

File:

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

src/interface/interface.cpp

@@ -12 +12 @@
 #endif
 
+#include <algorithm>
 #include <cmath>
 
@@ -19 +20 @@
 using namespace VMG;
 
-Interface::Interface(BC boundary, int levelMin_, int levelMax_, vmg_float box_begin_, vmg_float box_end_,
-                     int coarseningSteps, vmg_float alpha)
+void Interface::InitInterface(const Vector& box_offset, const vmg_float& box_size,
+                              const int& coarseningSteps, const vmg_float& alpha)
 {
-  bc = boundary;
-  levelMin = levelMin_;
-  levelMax = levelMax_;
+  Index size_factor_max = 1;
+  int num_cells;
 
-  bool restricted = false;
+  const Vector box_center = box_offset + 0.5 * box_size;
 
-  const vmg_float box_center = 0.5 * (box_begin_ + box_end_);
-  const vmg_float box_size = box_end_ - box_begin_;
-
-  for (int i=0; i<coarseningSteps; ++i) {
+  for (int i=levelMax; i>=levelMin; --i) {
 
     global.push_back(GlobalIndices());
     extent.push_back(SpatialExtent());
 
-    extent.back().SizeFactor() = Helper::intpow(2, static_cast<int>(log(pow(alpha, i+1)) / log(2.0) + 1.0));
+    num_cells = Helper::intpow(2, i);
 
-    extent.back().Size() = box_size * static_cast<Vector>(extent.back().SizeFactor());
-    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().SizeFactor() = 1;
+    extent.back().Size() = box_size;
+    extent.back().Begin() = box_offset;
+    extent.back().End() = box_offset + box_size;
+    extent.back().MeshWidth() = box_size / num_cells;
 
-    global.back().Size() = static_cast<Index>(static_cast<Vector>(extent.back().Size()) / extent.back().MeshWidth() + 0.5) + 1;
-    global.back().Begin() = 0;
-    global.back().End() = global.back().Size();
+    global.back().SizeGlobal() = num_cells + 1;
+    global.back().SizeLocal() = num_cells + 1;
+    global.back().BeginFinest() = 0;
+    global.back().BeginLocal() = 0;
+    global.back().EndLocal() = num_cells + 1;
+
+    if (i == levelMax) {
+      global.back().SizeFinest() = num_cells + 1;
+      global.back().EndFinest() = num_cells + 1;
+      global.back().BoundaryType() = GlobalMax;
+    }else {
+      global.back().SizeFinest() = (++global.rbegin())->SizeFinest();
+      global.back().EndFinest() = (++global.rbegin())->SizeFinest();
+      global.back().BoundaryType() = GlobalCoarsened;
+    }
 
   }
 
-  for (int i=0; i<coarseningSteps; ++i) {
-
-    if (restricted) {
-      global[i].BoundaryType() = GlobalCoarsened;
-    }else if (extent[i].SizeFactor() == extent.back().SizeFactor()) {
-      global[i].BoundaryType() = GlobalMax;
-      restricted = true;
-    }else {
-      global[i].BoundaryType() = LocallyRefined;
-    }
-
-    if (i==0) {
-      global[0].AlignmentBegin() = (global[0].Size() - static_cast<int>( pow(2.0, levelMax) + 0.5) - 1) / 2;
-    }else if (global[i].BoundaryType() == LocallyRefined)
-      global[i].AlignmentBegin() = (extent[i].Size() - extent[i-1].Size()) * pow(2.0, levelMax-i-1) + 0.5;
-    else if (global[i].BoundaryType() == GlobalMax)
-      global[i].AlignmentBegin() = (extent[i].Size() - extent[i-1].Size()) * pow(2.0, levelMax-i-1) - 0.5;
-    else
-      global[i].AlignmentBegin() = 0;
-
-    global[i].AlignmentEnd() = global[i].Size() - global[i].AlignmentBegin();
-  }
-
-  while (global.size() == 0 || global.back().Size().Max() > Helper::intpow(2,levelMin)+1) {
-
-    global.push_back(GlobalIndices());
-    extent.push_back(SpatialExtent());
-
-    extent.back().SizeFactor() = (global.size() > 1 ? (++extent.rbegin())->Size() : 1);
-    extent.back().Size() = (global.size() > 1 ?  (++extent.rbegin())->Size() : box_size);
-    extent.back().Begin() = box_center - 0.5 * static_cast<Vector>(extent.back().Size());
-    extent.back().End() = extent.back().Begin() + extent.back().Size();
-    extent.back().MeshWidth() = pow(2.0, static_cast<int>(global.size())-levelMax-1);
-
-    global.back().Size() = static_cast<Index>(static_cast<Vector>(extent.back().Size()) / extent.back().MeshWidth() + 0.5) + 1;
-    global.back().Begin() = 0;
-    global.back().End() = global.back().Size();
-
-    if (global.size() > 1)
-      global.back().BoundaryType() = GlobalCoarsened;
-    else
-      global.back().BoundaryType() = GlobalMax;
-
-    global.back().AlignmentBegin() = 0;
-    global.back().AlignmentEnd() = global.back().Size();
-
-  }
-
-  if (boundary == Periodic)
-    for (std::vector<GlobalIndices>::iterator iter=global.begin(); iter!=global.end(); ++iter)
-      iter->Size() -= 1;
+  for (int i=0; i<3; ++i)
+    if (bc[i] == Periodic)
+      for (unsigned int j=0; j<global.size(); ++j) {
+        global[j].SizeGlobal()[i] -= 1;
+        global[j].SizeFinest()[i] -= Helper::intpow(2, j);
+        global[j].SizeLocal()[i] -= 1;
+        global[j].EndLocal()[i] -= 1;
+        global[j].EndFinest()[i] -= Helper::intpow(2, j);
+      }
 
   levelMin = levelMax - global.size() + 1;