From c7b3b38407d13f8550f2a0cb5370bb4984b8f316 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Tue, 3 Sep 2013 16:30:28 +0000
Subject: [PATCH] Print assembly times only when verbosity == FULL
And set the inner loop solver verbosity to QUIET
[[Imported from SVN: r9435]]
---
dune/gfe/riemanniantrsolver.cc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dune/gfe/riemanniantrsolver.cc b/dune/gfe/riemanniantrsolver.cc
index d0b3e37c..bb4e29dd 100644
--- a/dune/gfe/riemanniantrsolver.cc
+++ b/dune/gfe/riemanniantrsolver.cc
@@ -115,7 +115,7 @@ setup(const GridType& grid,
innerIterations_,
innerTolerance_,
h1SemiNorm_,
- Solver::REDUCED));
+ Solver::QUIET));
// Write all intermediate solutions, if requested
if (instrumented_
@@ -242,14 +242,16 @@ void RiemannianTrustRegionSolver<GridType,TargetSpace>::solve()
assembler_->assembleGradient(x_, rhs);
rhs *= -1; // The right hand side is the _negative_ gradient
- std::cout << "gradient assembly took " << gradientTimer.elapsed() << " sec." << std::endl;
+ if (this->verbosity_ == Solver::FULL)
+ std::cout << "gradient assembly took " << gradientTimer.elapsed() << " sec." << std::endl;
gradientTimer.reset();
assembler_->assembleMatrix(x_,
*hessianMatrix_,
i==0 // assemble occupation pattern only for the first call
);
- std::cout << "hessian assembly took " << gradientTimer.elapsed() << " sec." << std::endl;
+ if (this->verbosity_ == Solver::FULL)
+ std::cout << "hessian assembly took " << gradientTimer.elapsed() << " sec." << std::endl;
recomputeGradientHessian = false;
}
--
GitLab