From 77dc60fedb5317dad87bda8d5eca065854e89ba3 Mon Sep 17 00:00:00 2001
From: podlesny <podlesny@zedat.fu-berlin.de>
Date: Thu, 8 Mar 2018 17:27:35 +0100
Subject: [PATCH] .
---
src/spatial-solving/solverfactory.cc | 10 +++++-----
src/spatial-solving/solverfactory.hh | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/spatial-solving/solverfactory.cc b/src/spatial-solving/solverfactory.cc
index 88d4d0c0..06022fd9 100644
--- a/src/spatial-solving/solverfactory.cc
+++ b/src/spatial-solving/solverfactory.cc
@@ -21,13 +21,13 @@ SolverFactory<dim, BlockProblem, DeformedGrid>::SolverFactory(
parset.get<double>("linear.tolerance"), &baseEnergyNorm,
Solver::QUIET),
transferOperators(grid.maxLevel()),
- multigridStep(
- std::make_shared<Step>(linearIterationStep, nonlinearSmoother)) {
+ multigridStep(std::make_shared<Step>(linearIterationStep, nonlinearSmoother)) {
+
// linear iteration step
linearIterationStep.setMGType(parset.get<int>("linear.cycle"),
parset.get<int>("linear.pre"),
parset.get<int>("linear.post"));
- linearIterationStep.basesolver_ = &linearBaseSolver;
+ //linearIterationStep.basesolver_ = &linearBaseSolver;
linearIterationStep.setSmoother(&linearPresmoother, &linearPostsmoother);
// transfer operators
@@ -38,9 +38,9 @@ SolverFactory<dim, BlockProblem, DeformedGrid>::SolverFactory(
linearIterationStep.setTransferOperators(transferOperators);
// tnnmg iteration step
- multigridStep->setSmoothingSteps(parset.get<int>("main.pre"),
+ /*multigridStep->setSmoothingSteps(parset.get<int>("main.pre"),
parset.get<int>("main.multi"),
- parset.get<int>("main.post"));
+ parset.get<int>("main.post")); */
multigridStep->ignoreNodes_ = &ignoreNodes;
}
diff --git a/src/spatial-solving/solverfactory.hh b/src/spatial-solving/solverfactory.hh
index 46df246c..c14ba311 100644
--- a/src/spatial-solving/solverfactory.hh
+++ b/src/spatial-solving/solverfactory.hh
@@ -10,9 +10,9 @@
#include <dune/solvers/solvers/loopsolver.hh>
#include <dune/solvers/transferoperators/compressedmultigridtransfer.hh>
#include <dune/tnnmg/iterationsteps/genericnonlineargs.hh>
-#include <dune/tnnmg/iterationsteps/tnnmgstep.hh>
+//#include <dune/tnnmg/iterationsteps/tnnmgstep.hh>
-#define USE_OLD_TNNMG
+#define USE_OLD_TNNMG //needed for old bisection.hh in tnnmg
template <size_t dim, class BlockProblemTEMPLATE, class DeformedGridTEMPLATE>
class SolverFactory {
@@ -28,8 +28,8 @@ class SolverFactory {
using NonlinearSmoother = GenericNonlinearGS<BlockProblem>;
public:
- using Step =
- TruncatedNonsmoothNewtonMultigrid<BlockProblem, NonlinearSmoother>;
+ using Step = NonlinearSmoother;
+ //TruncatedNonsmoothNewtonMultigrid<BlockProblem, NonlinearSmoother>;
SolverFactory(Dune::ParameterTree const &parset, const DeformedGrid& grid,
Dune::BitSetVector<dim> const &ignoreNodes);
--
GitLab