Changeset dfed1c for src/grid/grid.hpp

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/grid/grid.hpp (modified) (6 diffs)

src/grid/grid.hpp

@@ -12 +12 @@
 
 #include "base/object.hpp"
-#include "grid/grid_indexing.hpp"
+#include "grid/grid_index_translations.hpp"
+#include "grid/grid_iterator.hpp"
+#include "grid/grid_iterator_suite.hpp"
+#include "grid/grid_properties.hpp"
 
 namespace VMG
@@ -18 +21 @@
 
 class Comm;
+class Multigrid;
+class Stencil;
 
 class Grid : public Object
 {
 public:
-  Grid()
+  typedef GridIterator iterator;
+
+  Grid(int level_ = 0, Multigrid* father_ = NULL) :
+    index_translations(this),
+    level(level_),
+    father(father_)
   {
     grid = NULL;
   }
 
-  Grid(const GlobalIndices& global_, const LocalIndices& local_, const SpatialExtent& extent_) :
+  Grid(const GlobalIndices& global_, const LocalIndices& local_, const SpatialExtent& extent_,
+       int level_ = 0, Multigrid* father_ = NULL) :
+    index_translations(this),
+    level(level_),
     global(global_),
     local(local_),
-    extent(extent_)
-  {InitGrid();}
+    extent(extent_),
+    iterators(local_),
+    father(father_)
+  {
+    InitGrid();
+  }
+
+  Grid(const Grid& rhs) :
+    index_translations(rhs.Indexing()),
+    level(rhs.Level()),
+    global(rhs.Global()),
+    local(rhs.Local()),
+    extent(rhs.Extent()),
+    iterators(rhs.Iterators()),
+    father(rhs.Father())
+  {
+    InitGrid();
+    SetGrid(rhs);
+  }
 
   virtual ~Grid();
 
-  Grid(const Comm* comm, const Index& size, const vmg_float& width);
+  Grid& operator=(const Grid& rhs);
 
   const GlobalIndices& Global() const {return global;}
@@ -44 +74 @@
   LocalIndices& Local() {return local;}
   SpatialExtent& Extent() {return extent;}
+
+  GridIteratorSuite& Iterators() {return iterators;}
+  const GridIteratorSuite& Iterators() const {return iterators;}
 
   const vmg_float& MeshWidth() const {return Extent().MeshWidth().X();} ///< Mesh width of current level
@@ -77 +110 @@
   int GlobalLinearIndex(const Index& index) const;
 
-  Index GlobalToLocalIndex(const Index& index) const;
-
   bool IsCompatible(const Grid& rhs) const; ///< Check if two grids share compatible settings
   bool IsConsistent() const;                  ///< Check grid for nan and inf
+
+  Multigrid* Father() const {return father;}
 
   virtual vmg_float DebugKnownSolution(Vector x) const {return 0.0;}
   vmg_float DebugKnownSolution(Index i) const {return DebugKnownSolution(extent.Begin() + i * extent.MeshWidth());}
 
+  const GridIndexTranslations& Indexing() const {return index_translations;}
+
+  const int& Level() const {return level;}
+
+  bool IsActive() const {return Local().Size().Product() > 0;}
+
 private:
   void InitGrid();
 
+  GridIndexTranslations index_translations;
+
 protected:
+  int level;
+
   GlobalIndices global;
   LocalIndices local;
   SpatialExtent extent;
 
+  GridIteratorSuite iterators;
+
   vmg_float *grid;
+
+  Multigrid* father;
 
   static vmg_float correction;
@@ -120 +167 @@
 inline int Grid::GlobalLinearIndex(int x, int y, int z) const
 {
-  return z + global.Size().Z() * (y + global.Size().Y() * x);
+  return z + global.SizeGlobal().Z() * (y + global.SizeGlobal().Y() * x);
 }
 
@@ -128 +175 @@
 }
 
-inline Index Grid::GlobalToLocalIndex(const Index& index) const
-{
-  return index - Global().Begin() + Local().Begin();
-}
-
 }