From 5f6c2d39aed84d6d91d32f05d6711eca8041a1e7 Mon Sep 17 00:00:00 2001
From: Rainer Backofen <rainer.backofen@tu-dresden.de>
Date: Mon, 5 Oct 2009 09:04:54 +0000
Subject: [PATCH] set number of iterations in adaptInfo according to
mtl-solver.
ProblemScal.cc
ProblemVec.cc
ProblemNonLin.cc
---
AMDiS/src/ProblemNonLin.cc | 2 +-
AMDiS/src/ProblemScal.cc | 2 +-
AMDiS/src/ProblemVec.cc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/AMDiS/src/ProblemNonLin.cc b/AMDiS/src/ProblemNonLin.cc
index fd923458..c2e3b944 100644
--- a/AMDiS/src/ProblemNonLin.cc
+++ b/AMDiS/src/ProblemNonLin.cc
@@ -78,7 +78,7 @@ namespace AMDiS {
#if 0
TEST_EXIT(nonLinSolver_)("no non-linear solver!\n");
int iter = nonLinSolver_->solve(matVec, solution, rhs, leftPrecon, rightPrecon);
- adaptInfo->setSolverIterations(iter);
+ adaptInfo->setSolverIterations(solver->getIterations());
#endif
}
diff --git a/AMDiS/src/ProblemScal.cc b/AMDiS/src/ProblemScal.cc
index da30f354..4e35e06d 100644
--- a/AMDiS/src/ProblemScal.cc
+++ b/AMDiS/src/ProblemScal.cc
@@ -238,7 +238,7 @@ namespace AMDiS {
TIME_USED(first, clock()));
#endif
- adaptInfo->setSolverIterations(iter);
+ adaptInfo->setSolverIterations(solver->getIterations());
adaptInfo->setMaxSolverIterations(solver->getMaxIterations());
adaptInfo->setSolverTolerance(solver->getTolerance());
adaptInfo->setSolverResidual(solver->getResidual());
diff --git a/AMDiS/src/ProblemVec.cc b/AMDiS/src/ProblemVec.cc
index f249683c..8109c91f 100644
--- a/AMDiS/src/ProblemVec.cc
+++ b/AMDiS/src/ProblemVec.cc
@@ -497,7 +497,7 @@ namespace AMDiS {
TIME_USED(first, clock()));
#endif
- adaptInfo->setSolverIterations(iter);
+ adaptInfo->setSolverIterations(solver->getIterations());
adaptInfo->setMaxSolverIterations(solver->getMaxIterations());
adaptInfo->setSolverTolerance(solver->getTolerance());
adaptInfo->setSolverResidual(solver->getResidual());
--
GitLab