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

src/solver/solver.cpp

@@ -27 +27 @@
 #endif
 
-  Comm* comm = MG::GetComm();
-
-  Grid& rhsGlobal = comm->GetGlobalCoarseGrid(*rhs.Father());
-
-  this->Realloc(rhsGlobal);
-  this->AssembleMatrix(rhsGlobal);
-  this->Compute();
-  this->ExportSol(sol, rhs);
+  if (rhs.Global().LocalSize().Product() > 0) {
+    this->Realloc(rhs);
+    this->AssembleMatrix(rhs);
+    this->Compute();
+    this->ExportSol(sol, rhs);
+  }
 }
 
@@ -54 +52 @@
 void Solver::Realloc(Grid& sol)
 {
-  this->Realloc(sol.Global().SizeGlobal().Product());
+  this->Realloc(sol.Global().GlobalSize().Product());
 }