From ba4a6f454137e305c25849ec81d3b69363b922c5 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Mon, 8 Sep 2014 01:15:06 +0200
Subject: [PATCH] [Cleanup] Construct EnergyNorm where it's needed
---
src/coupledtimestepper.cc | 6 +-----
src/fixedpointiterator.cc | 13 +++++++------
src/fixedpointiterator.hh | 4 ++--
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/coupledtimestepper.cc b/src/coupledtimestepper.cc
index 17432aa1..f76b47e1 100644
--- a/src/coupledtimestepper.cc
+++ b/src/coupledtimestepper.cc
@@ -2,8 +2,6 @@
#include "config.h"
#endif
-#include <dune/solvers/norms/energynorm.hh>
-
#include "coupledtimestepper.hh"
#include "fixedpointiterator.hh"
@@ -40,13 +38,11 @@ int CoupledTimeStepper<Factory, StateUpdater, VelocityUpdater>::step(
stateUpdater_->setup(tau);
velocityUpdater_->setup(ell, tau, newRelativeTime, velocityRHS,
velocityIterate, velocityMatrix);
- EnergyNorm<Matrix, Vector> const velocityMatrixNorm(velocityMatrix);
-
FixedPointIterator<Factory, StateUpdater, VelocityUpdater> fixedPointIterator(
factory_, parset_, globalFriction_);
auto const iterations =
fixedPointIterator.run(stateUpdater_, velocityUpdater_, velocityMatrix,
- velocityMatrixNorm, velocityRHS, velocityIterate);
+ velocityRHS, velocityIterate);
return iterations;
}
diff --git a/src/fixedpointiterator.cc b/src/fixedpointiterator.cc
index 517db55b..d868eee0 100644
--- a/src/fixedpointiterator.cc
+++ b/src/fixedpointiterator.cc
@@ -5,6 +5,7 @@
#include <dune/common/exceptions.hh>
#include <dune/solvers/common/arithmetic.hh>
+#include <dune/solvers/norms/energynorm.hh>
#include <dune/solvers/solvers/loopsolver.hh>
#include "enums.hh"
@@ -30,14 +31,14 @@ template <class Factory, class StateUpdater, class VelocityUpdater>
int FixedPointIterator<Factory, StateUpdater, VelocityUpdater>::run(
std::shared_ptr<StateUpdater> stateUpdater,
std::shared_ptr<VelocityUpdater> velocityUpdater,
- Matrix const &velocityMatrix, Norm<Vector> const &velocityMatrixNorm,
- Vector const &velocityRHS, Vector &velocityIterate) {
+ Matrix const &velocityMatrix, Vector const &velocityRHS,
+ Vector &velocityIterate) {
auto multigridStep = factory_.getSolver();
+ EnergyNorm<Matrix, Vector> energyNorm(velocityMatrix);
LoopSolver<Vector> velocityProblemSolver(
- multigridStep, velocityMaxIterations_, velocityTolerance_,
- &velocityMatrixNorm, verbosity_, false); // absolute error
-
+ multigridStep, velocityMaxIterations_, velocityTolerance_, &energyNorm,
+ verbosity_, false); // absolute error
Vector previousVelocityIterate = velocityIterate;
size_t fixedPointIteration;
@@ -62,7 +63,7 @@ int FixedPointIterator<Factory, StateUpdater, VelocityUpdater>::run(
velocityProblemSolver.preprocess();
velocityProblemSolver.solve();
- if (velocityMatrixNorm.diff(previousVelocityIterate, velocityIterate) <
+ if (energyNorm.diff(previousVelocityIterate, velocityIterate) <
fixedPointTolerance_) {
fixedPointIteration++;
break;
diff --git a/src/fixedpointiterator.hh b/src/fixedpointiterator.hh
index 70a03c97..16b3eec5 100644
--- a/src/fixedpointiterator.hh
+++ b/src/fixedpointiterator.hh
@@ -23,8 +23,8 @@ class FixedPointIterator {
int run(std::shared_ptr<StateUpdater> stateUpdater,
std::shared_ptr<VelocityUpdater> velocityUpdater,
- Matrix const &velocityMatrix, Norm<Vector> const &velocityMatrixNorm,
- Vector const &velocityRHS, Vector &velocityIterate);
+ Matrix const &velocityMatrix, Vector const &velocityRHS,
+ Vector &velocityIterate);
private:
Factory &factory_;
--
GitLab