From 461c9f4089a9c4922777e33a1f7596554c863699 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 4 Nov 2014 16:30:18 +0100
Subject: [PATCH] [Cleanup] multigridStep: Rename: Solver -> Step
---
src/fixedpointiterator.cc | 2 +-
src/sand-wedge.cc | 2 +-
src/solverfactory.cc | 6 +++---
src/solverfactory.hh | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/fixedpointiterator.cc b/src/fixedpointiterator.cc
index e08ef871..b8fa3e55 100644
--- a/src/fixedpointiterator.cc
+++ b/src/fixedpointiterator.cc
@@ -38,7 +38,7 @@ FixedPointIterator<Factory, StateUpdater, VelocityUpdater, ErrorNorm>::run(
std::shared_ptr<VelocityUpdater> velocityUpdater,
Matrix const &velocityMatrix, Vector const &velocityRHS,
Vector &velocityIterate) {
- auto multigridStep = factory_.getSolver();
+ auto multigridStep = factory_.getStep();
EnergyNorm<Matrix, Vector> energyNorm(velocityMatrix);
LoopSolver<Vector> velocityProblemSolver(
diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc
index 99616319..6615a7a1 100644
--- a/src/sand-wedge.cc
+++ b/src/sand-wedge.cc
@@ -235,7 +235,7 @@ int main(int argc, char *argv[]) {
1.0, _matrix, zeroNonlinearity, _rhs, _x);
typename LinearFactory::BlockProblem problem(parset, convexProblem);
- auto multigridStep = factory.getSolver();
+ auto multigridStep = factory.getStep();
multigridStep->setProblem(_x, problem);
LoopSolver<Vector> solver(
multigridStep.get(), _localParset.get<size_t>("maximumIterations"),
diff --git a/src/solverfactory.cc b/src/solverfactory.cc
index 2d58ea17..97a09f5e 100644
--- a/src/solverfactory.cc
+++ b/src/solverfactory.cc
@@ -22,7 +22,7 @@ SolverFactory<dim, BlockProblem, Grid>::SolverFactory(
Solver::QUIET),
transferOperators(refinements),
multigridStep(
- std::make_shared<Solver>(linearIterationStep, nonlinearSmoother)) {
+ std::make_shared<Step>(linearIterationStep, nonlinearSmoother)) {
// linear iteration step
linearIterationStep.setMGType(parset.get<int>("linear.cycle"),
parset.get<int>("linear.pre"),
@@ -51,8 +51,8 @@ SolverFactory<dim, BlockProblem, Grid>::~SolverFactory() {
}
template <size_t dim, class BlockProblem, class Grid>
-auto SolverFactory<dim, BlockProblem, Grid>::getSolver()
- -> std::shared_ptr<Solver> {
+auto SolverFactory<dim, BlockProblem, Grid>::getStep()
+ -> std::shared_ptr<Step> {
return multigridStep;
}
diff --git a/src/solverfactory.hh b/src/solverfactory.hh
index 550a4f17..91353289 100644
--- a/src/solverfactory.hh
+++ b/src/solverfactory.hh
@@ -26,7 +26,7 @@ class SolverFactory {
private:
using NonlinearSmoother = GenericNonlinearGS<BlockProblem>;
- using Solver =
+ using Step =
TruncatedNonsmoothNewtonMultigrid<BlockProblem, NonlinearSmoother>;
public:
@@ -35,7 +35,7 @@ class SolverFactory {
~SolverFactory();
- std::shared_ptr<Solver> getSolver();
+ std::shared_ptr<Step> getStep();
private:
TruncatedBlockGSStep<Matrix, Vector> linearBaseSolverStep;
@@ -46,6 +46,6 @@ class SolverFactory {
MultigridStep<Matrix, Vector> linearIterationStep;
std::vector<CompressedMultigridTransfer<Vector> *> transferOperators;
NonlinearSmoother nonlinearSmoother;
- std::shared_ptr<Solver> multigridStep;
+ std::shared_ptr<Step> multigridStep;
};
#endif
--
GitLab