Changeset dfed1c for src/smoother/gs.cpp

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/smoother/gs.cpp (modified) (3 diffs)

src/smoother/gs.cpp

@@ -24 +24 @@
 void GaussSeidel::Compute(Grid& sol, Grid& rhs)
 {
-#ifdef DEBUG
+#ifdef DEBUG_MATRIX_CHECKS
   sol.IsConsistent();
   rhs.IsConsistent();
@@ -30 +30 @@
 #endif
 
-  int i,j,k;
+  Grid::iterator grid_iter;
+  Stencil::iterator stencil_iter;
   vmg_float temp;
 
@@ -37 +38 @@
   const vmg_float diag_inv = 1.0 / A.GetDiag();
 
-  for (i=rhs.Local().Begin().X(); i<rhs.Local().End().X(); i++)
-    for (j=rhs.Local().Begin().Y(); j<rhs.Local().End().Y(); j++)
-      for (k=rhs.Local().Begin().Z(); k<rhs.Local().End().Z(); k++) {
+  for (grid_iter = rhs.Iterators().Local().Begin(); grid_iter != rhs.Iterators().Local().End(); ++grid_iter) {
 
-        temp = prefactor_inv * rhs.GetCorrectedVal(i, j, k);
+    temp = prefactor_inv * rhs.GetCorrectedVal(*grid_iter);
 
-        for (Stencil::iterator iter=A.begin(); iter!=A.end(); iter++) {
+    for (stencil_iter=A.begin(); stencil_iter!=A.end(); ++stencil_iter)
+      temp -= stencil_iter->Val() * sol.GetVal(*grid_iter + stencil_iter->Disp());
 
-          assert(i+iter->m >= 0 && i+iter->m < sol.Local().SizeTotal().X());
-          assert(j+iter->n >= 0 && j+iter->n < sol.Local().SizeTotal().Y());
-          assert(k+iter->o >= 0 && k+iter->o < sol.Local().SizeTotal().Z());
+    sol(*grid_iter) = temp * diag_inv;
 
-          temp -= iter->val * sol.GetVal(i+iter->m, j+iter->n, k+iter->o);
-
-        }
-
-        sol(i, j, k) = temp * diag_inv;
-
-      }
+  }
 }