Changeset ac6d04 for src/grid/is_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/is_grid.hpp (modified) (2 diffs)

src/grid/is_grid.hpp

@@ -154 +154 @@
 inline int IsGrid<T>::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);
 }
 
@@ -160 +160 @@
 inline int IsGrid<T>::GlobalLinearIndex(const Index& index) const
 {
-  return GlobalLinearIndex(index.X(), index.Y(), index.Z());
+  return index.Z() + global.GlobalSize().Z() * (index.Y() + global.GlobalSize().Y() * index.X());
 }