Changeset ac6d04 for src/solver/solver_regular.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/solver/solver_regular.cpp (modified) (5 diffs)

src/solver/solver_regular.cpp

@@ -38 +38 @@
 #endif
 
-  this->Realloc(rhs.Global().SizeGlobal().Product());
+  this->Realloc(rhs.Global().GlobalSize().Product());
 
   for (grid_iter = rhs.Iterators().Local().Begin(); grid_iter != rhs.Iterators().Local().End(); ++grid_iter) {
 
-    mat_index = rhs.GlobalLinearIndex(*grid_iter + rhs.Global().BeginLocal());
+    mat_index = rhs.GlobalLinearIndex(*grid_iter + rhs.Global().LocalBegin());
 
     assert(mat_index >= 0 && mat_index<this->Size());
@@ -56 +56 @@
     for (stencil_iter = A.begin(); stencil_iter != A.end(); ++stencil_iter) {
 
-      mat_index2 = rhs.GlobalLinearIndex(*grid_iter + rhs.Global().BeginLocal() + stencil_iter->Disp());
+      mat_index2 = rhs.GlobalLinearIndex(*grid_iter + rhs.Global().LocalBegin() + stencil_iter->Disp());
 
       assert(mat_index2 >= 0 && mat_index2<this->Size());
@@ -69 +69 @@
     for (grid_iter = rhs.Iterators().Boundary1()[i].Begin(); grid_iter != rhs.Iterators().Boundary1()[i].End(); ++grid_iter) {
 
-      mat_index = rhs.GlobalLinearIndex(*grid_iter + rhs.Global().BeginLocal());
+      mat_index = rhs.GlobalLinearIndex(*grid_iter + rhs.Global().LocalBegin());
 
       assert(mat_index >= 0 && mat_index<this->Size());
@@ -84 +84 @@
     for (grid_iter = rhs.Iterators().Boundary2()[i].Begin(); grid_iter != rhs.Iterators().Boundary2()[i].End(); ++grid_iter) {
 
-      mat_index = rhs.GlobalLinearIndex(*grid_iter + rhs.Global().BeginLocal());
+      mat_index = rhs.GlobalLinearIndex(*grid_iter + rhs.Global().LocalBegin());
 
       assert(mat_index >= 0 && mat_index<this->Size());
@@ -110 +110 @@
 
   for (Grid::iterator iter = sol.Iterators().CompleteGrid().Begin(); iter != sol.Iterators().CompleteGrid().End(); ++iter) {
-    index = sol.GlobalLinearIndex(sol.Global().BeginLocal() + *iter - offset);
+    index = sol.GlobalLinearIndex(sol.Global().LocalBegin() + *iter - offset);
     sol(*iter) = this->Sol(index);
   }