Changeset dfed1c for src/smoother/gsrb.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/gsrb.cpp (modified) (2 diffs)

src/smoother/gsrb.cpp

@@ -13 +13 @@
 
 #include "base/discretization.hpp"
+#include "base/timer.hpp"
 #include "base/stencil.hpp"
+#include "comm/comm.hpp"
 #include "grid/grid.hpp"
 #include "smoother/gsrb.hpp"
@@ -21 +23 @@
 void GaussSeidelRB::Compute(Grid& sol, Grid& rhs)
 {
-#ifdef DEBUG
+#ifdef DEBUG_MATRIX_CHECKS
   sol.IsConsistent();
   rhs.IsConsistent();
+#endif
+
+#ifdef DEBUG
   sol.IsCompatible(rhs);
 #endif
 
-  int i,j,k;
+  Timer::Start("SmootherWithoutCommunication");
+
+  Index i;
   vmg_float temp;
   const Stencil& A = MG::GetDiscretization()->GetStencil();
   const vmg_float prefactor_inv = 1.0 / MG::GetDiscretization()->OperatorPrefactor(sol);
   const vmg_float diag_inv = 1.0 / A.GetDiag();
+  const int off = rhs.Global().BeginLocal().Sum() - rhs.Local().HasHalo1().Sum();
 
-  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() + ((i+j+1) % 2); k<rhs.Local().End().Z(); k+=2) {
+  for (i.X()=rhs.Local().Begin().X(); i.X()<rhs.Local().End().X(); ++i.X())
+    for (i.Y()=rhs.Local().Begin().Y(); i.Y()<rhs.Local().End().Y(); ++i.Y())
+      for (i.Z()=rhs.Local().Begin().Z() + ((i.X()+i.Y()+off+1) % 2); i.Z()<rhs.Local().End().Z(); i.Z()+=2) {
 
-        temp = prefactor_inv * rhs.GetCorrectedVal(i,j,k);
+        temp = prefactor_inv * rhs.GetCorrectedVal(i);
 
-        for (Stencil::iterator iter=A.begin(); iter!=A.end(); iter++)
-          temp -= iter->val * sol.GetVal(i+iter->m, j+iter->n, k+iter->o);
+        for (Stencil::iterator iter=A.begin(); iter!=A.end(); ++iter)
+          temp -= iter->Val() * sol.GetVal(i + iter->Disp());
 
-        sol(i, j, k) = temp * diag_inv;
+        sol(i) = temp * diag_inv;
 
       }
 
-  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() + ((i+j) % 2); k<rhs.Local().End().Z(); k+=2) {
+  Timer::Stop("SmootherWithoutCommunication");
 
-        temp = prefactor_inv * rhs.GetCorrectedVal(i,j,k);
+  MG::GetComm()->CommToGhosts(sol);
 
-        for (Stencil::iterator iter=A.begin(); iter!=A.end(); iter++)
-          temp -= iter->val * sol.GetVal(i+iter->m, j+iter->n, k+iter->o);
+  Timer::Start("SmootherWithoutCommunication");
 
-        sol(i, j, k) = temp * diag_inv;
+  for (i.X()=rhs.Local().Begin().X(); i.X()<rhs.Local().End().X(); ++i.X())
+    for (i.Y()=rhs.Local().Begin().Y(); i.Y()<rhs.Local().End().Y(); ++i.Y())
+      for (i.Z()=rhs.Local().Begin().Z() + ((i.X()+i.Y()+off) % 2); i.Z()<rhs.Local().End().Z(); i.Z()+=2) {
+
+        temp = prefactor_inv * rhs.GetCorrectedVal(i);
+
+        for (Stencil::iterator iter=A.begin(); iter!=A.end(); ++iter)
+          temp -= iter->Val() * sol.GetVal(i + iter->Disp());
+
+        sol(i) = temp * diag_inv;
 
       }
+
+  Timer::Stop("SmootherWithoutCommunication");
 }