Changeset ac6d04 for src/grid/grid_index_translations.cpp

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_index_translations.cpp (modified) (4 diffs)

src/grid/grid_index_translations.cpp

@@ -24 +24 @@
 Index GridIndexTranslations::GlobalToLocal(const Index& index_global) const
 {
-  return index_global - Father()->Global().BeginLocal() + Father()->Local().Begin();
+  const Index index_local = index_global - Father()->Global().LocalBegin() + Father()->Local().Begin();
+  return index_local;
 }
 
 Index GridIndexTranslations::GlobalToFiner(const Index& index_global)
 {
-  return 2 * index_global;
+  const Index index_finer = 2 * index_global;
+  return index_finer;
 }
 
 Index GridIndexTranslations::GlobalToCoarser(const Index& index_global)
 {
-  for (int i=0; i<3; ++i)
-    assert(index_global[i] % 2 == 0);
-
-  return index_global / 2;
+  assert(index_global % 2 == 0);
+  const Index index_coarser = index_global / 2;
+  return index_coarser;
 }
 
 Index GridIndexTranslations::GlobalToFiner(const Index& index_global, const int& num_levels)
 {
-  return Helper::intpow(2, num_levels) * index_global;
+  const Index index_finer = Helper::intpow(2, num_levels) * index_global;
+  return index_finer;
 }
 
@@ -48 +50 @@
 {
   int quotient = Helper::intpow(2, num_levels);
-
-  for (int i=0; i<3; ++i)
-    assert(index_global[i] % quotient == 0);
-
-  return index_global / quotient;
+  assert(index_global % quotient == 0);
+  const Index index_coarser = index_global / quotient;
+  return index_coarser;
 }
 
 Index GridIndexTranslations::LocalToGlobal(const Index& index_local) const
 {
-  return index_local - Father()->Local().Begin() + Father()->Global().BeginLocal();
+  const Index index_global = index_local - Father()->Local().Begin() + Father()->Global().LocalBegin();
+  return index_global;
 }
 
@@ -69 +70 @@
   assert(Father()->Level() < multigrid.MaxLevel());
 
-  Index index_global_fine = GlobalToFiner(LocalToGlobal(index_local));
+  const Index index_global_fine = GlobalToFiner(LocalToGlobal(index_local));
+  const Index index_local_fine = multigrid(Father()->Level()+1).Indexing().GlobalToLocal(index_global_fine);
 
-  return multigrid(Father()->Level()+1).Indexing().GlobalToLocal(index_global_fine);
+  return index_local_fine;
 }
 
@@ -83 +85 @@
   assert(Father()->Level() > multigrid.MinLevel());
 
-  Index index_global_coarse = GlobalToCoarser(LocalToGlobal(index_local));
+  const Index index_global_coarse = GlobalToCoarser(LocalToGlobal(index_local));
+  const Index index_local_coarse = multigrid(Father()->Level()-1).Indexing().GlobalToLocal(index_global_coarse);
 
-  return multigrid(Father()->Level()-1).Indexing().GlobalToLocal(index_global_coarse);
+  return index_local_coarse;
 }
 
 Index GridIndexTranslations::FinestGlobalToLocal(const Index& index_finest) const
 {
-  return GlobalToLocal(FinestGlobalToGlobal(index_finest));
+  const Index index_local = GlobalToLocal(FinestGlobalToGlobal(index_finest));
+  return index_local;
 }
 
 Index GridIndexTranslations::FinestGlobalToGlobal(const Index& index_finest) const
 {
-  int quotient = Helper::intpow(2, Father()->Father()->MaxLevel() - Father()->Level());
-
-  for (int i=0; i<3; ++i)
-    assert(index_finest[i] % quotient == 0);
-
-  return index_finest / quotient;
+  const int quotient = Helper::intpow(2, Father()->Father()->MaxLevel() - Father()->Level());
+  assert(index_finest % quotient == 0);
+  const Index index_global = index_finest / quotient;
+  return index_global;
 }