From 89a75f8148dd2127764466c604526f492e519fa7 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Mon, 13 Feb 2017 16:23:14 +0100
Subject: [PATCH] [richards] Use new chop property to speed up convergene with
the implemented chop algo
---
dumux/porousmediumflow/richards/implicit/newtoncontroller.hh | 3 ++-
.../richards/implicit/test_boxrichards.input | 5 +++--
.../porousmediumflow/richards/implicit/test_ccrichards.input | 5 +++--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/dumux/porousmediumflow/richards/implicit/newtoncontroller.hh b/dumux/porousmediumflow/richards/implicit/newtoncontroller.hh
index 0c2db36640..e33313d450 100644
--- a/dumux/porousmediumflow/richards/implicit/newtoncontroller.hh
+++ b/dumux/porousmediumflow/richards/implicit/newtoncontroller.hh
@@ -80,7 +80,8 @@ public:
{
ParentType::newtonUpdate(uCurrentIter, uLastIter, deltaU);
- if ((!GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, UseLineSearch)))
+ if ((!GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, UseLineSearch))
+ && GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, EnableChop ))
{
// do not clamp anything after 5 iterations
if (this->numSteps_ > 4)
diff --git a/test/porousmediumflow/richards/implicit/test_boxrichards.input b/test/porousmediumflow/richards/implicit/test_boxrichards.input
index 4161962997..60d877dac8 100644
--- a/test/porousmediumflow/richards/implicit/test_boxrichards.input
+++ b/test/porousmediumflow/richards/implicit/test_boxrichards.input
@@ -11,8 +11,9 @@ Name = richardslensbox
EnableGravity = 1 # enable gravity
[Implicit]
-EnablePartialReassemble = 1 # enable partial reassembly of the Jacobian matrix
-EnableJacobianRecycling = 1 #
+EnablePartialReassemble = true # enable partial reassembly of the Jacobian matrix
+EnableJacobianRecycling = true #
[Newton]
TargetSteps = 18 # set the "desireable" number of newton iterations of a time step
+EnableChop = true # chop for better convergence
diff --git a/test/porousmediumflow/richards/implicit/test_ccrichards.input b/test/porousmediumflow/richards/implicit/test_ccrichards.input
index effd06edc0..5ed3375d5d 100644
--- a/test/porousmediumflow/richards/implicit/test_ccrichards.input
+++ b/test/porousmediumflow/richards/implicit/test_ccrichards.input
@@ -11,8 +11,9 @@ Name = richardslenscc
EnableGravity = 1 # enable gravity
[Implicit]
-EnablePartialReassemble = 1 # enable partial reassembly of the Jacobian matrix
-EnableJacobianRecycling = 1 #
+EnablePartialReassemble = true # enable partial reassembly of the Jacobian matrix
+EnableJacobianRecycling = true #
[Newton]
TargetSteps = 18 # set the "desireable" number of newton iterations of a time step
+EnableChop = true # chop for better convergence
--
GitLab