Changeset 49f8653 for src

Timestamp:

May 2, 2012, 1:36:54 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

4e8206

Parents:

6fee21

Message:

Increase serial performance.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1782 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/comm/comm.cpp (modified) (2 diffs)

src/comm/comm.cpp

@@ -27 +27 @@
 using namespace VMG;
 
-vmg_float Comm::ComputeResidualNorm(Multigrid& sol, Multigrid& rhs)
+vmg_float Comm::ComputeResidualNorm(Multigrid& sol_mg, Multigrid& rhs_mg)
 {
 #ifdef DEBUG_MATRIX_CHECKS
@@ -35 +35 @@
 #endif
 
-  Grid::iterator grid_iter;
   Stencil::iterator stencil_iter;
-  vmg_float val;
   vmg_float norm = 0.0;
 
-  const vmg_float prefactor = MG::GetDiscretization()->OperatorPrefactor(sol());
+  const vmg_float prefactor = MG::GetDiscretization()->OperatorPrefactor(sol_mg());
   const Stencil& A = MG::GetDiscretization()->GetStencil();
 
-  this->CommToGhosts(sol());
+  this->CommToGhosts(sol_mg());
 
-  if (sol().Global().BoundaryType() == LocallyRefined)
-    MG::GetDiscretization()->SetInnerBoundary(sol(), rhs(), sol(sol.Level()-1));
+  if (sol_mg().Global().BoundaryType() == LocallyRefined)
+    MG::GetDiscretization()->SetInnerBoundary(sol_mg(), rhs_mg(), sol_mg(sol_mg.Level()-1));
 
-  for (grid_iter=rhs().Iterators().Local().Begin(); grid_iter!=rhs().Iterators().Local().End(); ++grid_iter) {
-    val = rhs().GetVal(*grid_iter) - prefactor * A.GetDiag() * sol().GetVal(*grid_iter);
-    for (stencil_iter=A.begin(); stencil_iter!=A.end(); ++stencil_iter)
-      val -= prefactor * stencil_iter->Val() * sol().GetVal(grid_iter->X() + stencil_iter->Disp().X(),
-                                                            grid_iter->Y() + stencil_iter->Disp().Y(),
-                                                            grid_iter->Z() + stencil_iter->Disp().Z());
-    norm += val*val;
-  }
+  const Grid& sol = sol_mg();
+  const Grid& rhs = rhs_mg();
 
-  norm = sqrt(sol().Extent().MeshWidth().Product() * GlobalSum(norm));
+  for (int i=rhs.Local().Begin().X(); i<rhs.Local().End().X(); ++i)
+    for (int j=rhs.Local().Begin().Y(); j<rhs.Local().End().Y(); ++j)
+      for (int k=rhs.Local().Begin().Z(); k<rhs.Local().End().Z(); ++k) {
+        vmg_float val = rhs.GetVal(i,j,k) - prefactor * A.GetDiag() * sol.GetVal(i,j,k);
+        for (stencil_iter=A.begin(); stencil_iter!=A.end(); ++stencil_iter)
+          val -= prefactor * stencil_iter->Val() * sol.GetVal(i + stencil_iter->Disp().X(),
+                                                              j + stencil_iter->Disp().Y(),
+                                                              k + stencil_iter->Disp().Z());
+        norm = val*val;
+      }
+        
+  norm = GlobalSum(norm);
+  norm = std::sqrt(sol.Extent().MeshWidth().Product() * norm);
 
   return norm;