Changeset dfed1c for src/grid/grid_properties.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_properties.hpp (moved) (moved from src/grid/grid_indexing.hpp ) (7 diffs)

src/grid/grid_properties.hpp

@@ -1 +1 @@
 /**
- * @file   grid_indexing.hpp
+ * @file   grid_properties.hpp
  * @author Julian Iseringhausen <isering@ins.uni-bonn.de>
  * @date   Mon Apr 18 12:54:05 2011
@@ -8 +8 @@
  */
 
-#ifndef GRID_INDEXING_HPP_
-#define GRID_INDEXING_HPP_
+#ifndef GRID_PROPERTIES_HPP_
+#define GRID_PROPERTIES_HPP_
 
+#include "base/defs.hpp"
 #include "base/index.hpp"
 #include "base/vector.hpp"
@@ -20 +21 @@
 {
 public:
-  const Index& Size() const {return size;}                       ///< Global grid size including boundary
-  const Index& Begin() const {return begin;}                     ///< Global index of first local grid point
-  const Index& End() const {return end;}                         ///< Global index of first non-local grid point
-  const Index& AlignmentBegin() const {return alignmentBegin;} ///< Global index of first point of the next higher level
-  const Index& AlignmentEnd() const {return alignmentEnd;}
+  GlobalIndices();
+
+  const Index& BeginFinest() const {return begin_finest;}                        ///< Global index of first local grid point
+  const Index& EndFinest() const {return end_finest;}                            ///< Global index of first non-local grid point
+  const Index& SizeFinest() const {return size_finest;}                          ///< Global grid size including boundary
+
+  const Index& BeginLocal() const {return begin_local;}
+  const Index& EndLocal() const {return end_local;}
+  const Index& SizeLocal() const {return size_local;}
+
+  const Index& SizeGlobal() const {return size_global;}
+
   const BT& BoundaryType() const {return boundary;}
 
-  Index& Size() {return size;}                     ///< Global grid size including boundary
-  Index& Begin() {return begin;}                     ///< Global index of first local grid point
-  Index& End() {return end;}                         ///< Global index of first non-local grid point
-  Index& AlignmentBegin() {return alignmentBegin;} ///< Global index of first point of the next higher level
-  Index& AlignmentEnd() {return alignmentEnd;}
+  Index& BeginFinest() {return begin_finest;}                ///< Global index of first local grid point
+  Index& EndFinest() {return end_finest;}                    ///< Global index of first non-local grid point
+  Index& SizeFinest() {return size_finest;}                     ///< Global grid size including boundary
+
+  Index& BeginLocal() {return begin_local;}
+  Index& EndLocal() {return end_local;}
+  Index& SizeLocal() {return size_local;}
+
+  Index& SizeGlobal() {return size_global;}
+
   BT& BoundaryType() {return boundary;}
 
 private:
-  Index size;
-  Index begin;
-  Index end;
-  Index alignmentBegin, alignmentEnd;
+  Index begin_finest, end_finest, size_finest;
+  Index begin_local, end_local, size_local;
+  Index size_global;
   BT boundary;
 };
@@ -45 +57 @@
 {
 public:
+  LocalIndices();
+
   const Index& Size() const {return size;}           ///< Local grid size excluding halo
   const Index& SizeTotal() const {return sizeTotal;} ///< Local grid size including halo and boundary
@@ -81 +95 @@
   Index& AlignmentEnd() {return alignmentEnd;}
 
+  Index HasHalo1() const;
+  Index HasHalo2() const;
+  Index HasBoundary1() const;
+  Index HasBoundary2() const;
+
 private:
   Index size;
@@ -96 +115 @@
 {
 public:
+  SpatialExtent();
+
   const Vector& Size() const {return size;}
   const Index& SizeFactor() const {return size_factor;}
@@ -118 +139 @@
 }
 
-#endif /* GRID_INDEXING_HPP_ */
+#endif /* GRID_PROPERTIES_HPP_ */