From e9943306075c23621b66ad9293f7fbd56e5f2f03 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Wed, 17 Jul 2013 18:56:50 +0200
Subject: [PATCH] [Cleanup] Rename: FactoryType -> NonlinearFactoryType
---
src/one-body-sample.cc | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 68a3a3be..3dda82d3 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -392,13 +392,14 @@ int main(int argc, char *argv[]) {
// Set up TNNMG solver
auto const solverTolerance = parset.get<double>("solver.tolerance");
- using FactoryType = MySolver<
+ using NonlinearFactoryType = MySolver<
dims,
MyBlockProblem<ConvexProblem<
Dune::GlobalNonlinearity<MatrixType, VectorType>, MatrixType>>,
GridType>;
- FactoryType factory(parset.sub("solver.tnnmg"), refinements,
- solverTolerance, *grid, velocityDirichletNodes);
+ NonlinearFactoryType factory(parset.sub("solver.tnnmg"), refinements,
+ solverTolerance, *grid,
+ velocityDirichletNodes);
auto multigridStep = factory.getSolver();
Solver::VerbosityMode const verbosity =
parset.get<bool>("verbose") ? Solver::FULL : Solver::QUIET;
@@ -466,11 +467,11 @@ int main(int argc, char *argv[]) {
myGlobalNonlinearity->updateState(_alpha);
// FIXME: Do we really need to pass u here?
- typename FactoryType::ConvexProblemType const myConvexProblem(
+ typename NonlinearFactoryType::ConvexProblemType const myConvexProblem(
1.0, problem_AM, *myGlobalNonlinearity, problem_rhs,
_problem_iterate);
- typename FactoryType::BlockProblemType velocityProblem(parset,
- myConvexProblem);
+ typename NonlinearFactoryType::BlockProblemType velocityProblem(
+ parset, myConvexProblem);
multigridStep->setProblem(_problem_iterate, velocityProblem);
velocityProblemSolver.preprocess();
--
GitLab