Changeset ac6d04 for src/grid/grid.hpp

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

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

File:

• src/grid/grid.hpp (modified) (3 diffs)

src/grid/grid.hpp

@@ -37 +37 @@
   }
 
-  Grid(const GlobalIndices& global_, const LocalIndices& local_, const SpatialExtent& extent_,
-       int level_ = 0, Multigrid* father_ = NULL) :
+  Grid(const GlobalIndices& global_,
+       const LocalIndices& local_,
+       const SpatialExtent& extent_,
+       int level_ = 0,
+       Multigrid* father_ = NULL) :
     index_translations(this),
     level(level_),
@@ -67 +70 @@
   Grid& operator=(const Grid& rhs);
 
+  GlobalIndices& Global() {return global;}
+  LocalIndices& Local() {return local;}
+  SpatialExtent& Extent() {return extent;}
+
   const GlobalIndices& Global() const {return global;}
   const LocalIndices& Local() const {return local;}
   const SpatialExtent& Extent() const {return extent;}
 
-  GlobalIndices& Global() {return global;}
-  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
 
   static vmg_float& Correction() {return Grid::correction;}
@@ -167 +168 @@
 inline int Grid::GlobalLinearIndex(int x, int y, int z) const
 {
-  return z + global.SizeGlobal().Z() * (y + global.SizeGlobal().Y() * x);
+  return z + global.GlobalSize().Z() * (y + global.GlobalSize().Y() * x);
 }