From 59a2a1cc280b24b47661aab08063b8c457be61b8 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Fri, 6 Apr 2018 15:56:27 +0200
Subject: [PATCH] [test][2p1cni][implicit] Use NewtonSolver
---
.../2p1c/implicit/test_2p1c_fv.cc | 34 +++++--------------
1 file changed, 8 insertions(+), 26 deletions(-)
diff --git a/test/porousmediumflow/2p1c/implicit/test_2p1c_fv.cc b/test/porousmediumflow/2p1c/implicit/test_2p1c_fv.cc
index d87098fa99..f6ec0b61d7 100644
--- a/test/porousmediumflow/2p1c/implicit/test_2p1c_fv.cc
+++ b/test/porousmediumflow/2p1c/implicit/test_2p1c_fv.cc
@@ -41,9 +41,8 @@
#include <dumux/common/dumuxmessage.hh>
#include <dumux/common/defaultusagemessage.hh>
- #include <dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh>
#include <dumux/linear/seqsolverbackend.hh>
- #include <dumux/nonlinear/newtonmethod.hh>
+ #include <dumux/nonlinear/privarswitchnewtonsolver.hh>
#include <dumux/assembly/fvassembler.hh>
@@ -108,7 +107,6 @@
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
auto dt = getParam<Scalar>("TimeLoop.DtInitial");
- auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
// intialize the vtk output module
@@ -130,9 +128,9 @@
auto linearSolver = std::make_shared<LinearSolver>();
// the non-linear solver
- using NewtonController = Dumux::PriVarSwitchNewtonController<TypeTag>;
- auto newtonController = std::make_shared<NewtonController>(timeLoop);
- NewtonMethod<NewtonController, Assembler, LinearSolver> nonLinearSolver(newtonController, assembler, linearSolver);
+ using PrimaryVariableSwitch = typename GET_PROP_TYPE(TypeTag, PrimaryVariableSwitch);
+ using NewtonSolver = Dumux::PriVarSwitchNewtonSolver<Assembler, LinearSolver, PrimaryVariableSwitch>;
+ NewtonSolver nonLinearSolver(assembler, linearSolver);
// time loop
timeLoop->start(); do
@@ -140,24 +138,8 @@
// set previous solution for storage evaluations
assembler->setPreviousSolution(xOld);
- // try solving the non-linear system
- for (int i = 0; i < maxDivisions; ++i)
- {
- // linearize & solve
- auto converged = nonLinearSolver.solve(x);
-
- if (converged)
- break;
-
- if (!converged && i == maxDivisions-1)
- DUNE_THROW(Dune::MathError,
- "Newton solver didn't converge after "
- << maxDivisions
- << " time-step divisions. dt="
- << timeLoop->timeStepSize()
- << ".\nThe solutions of the current and the previous time steps "
- << "have been saved to restart files.");
- }
+ // solve the non-linear system with time step control
+ nonLinearSolver.solve(x, *timeLoop);
// make the new solution the old solution
xOld = x;
@@ -172,8 +154,8 @@
// report statistics of this time step
timeLoop->reportTimeStep();
- // set new dt as suggested by newton controller
- timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+ // set new dt as suggested by the newton solver
+ timeLoop->setTimeStepSize(nonLinearSolver.suggestTimeStepSize(timeLoop->timeStepSize()));
} while (!timeLoop->finished());
--
GitLab