From 019b0a813e8d3b9f1825fcec5d0fd580f3abea3f Mon Sep 17 00:00:00 2001
From: Martin Schneider <martin.schneider@iws.uni-stuttgart.de>
Date: Thu, 19 Sep 2019 12:16:55 +0200
Subject: [PATCH] [newton] Converge if either shift or reduction is fulfilled
---
dumux/nonlinear/newtonsolver.hh | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/dumux/nonlinear/newtonsolver.hh b/dumux/nonlinear/newtonsolver.hh
index 42e2eca635..43c87aeacc 100644
--- a/dumux/nonlinear/newtonsolver.hh
+++ b/dumux/nonlinear/newtonsolver.hh
@@ -565,6 +565,15 @@ public:
return shift_ <= shiftTolerance_
&& reduction_ <= reductionTolerance_;
}
+ else if(enableShiftCriterion_ && enableResidualCriterion_)
+ {
+ if(enableAbsoluteResidualCriterion_)
+ return shift_ <= shiftTolerance_
+ || residualNorm_ <= residualTolerance_;
+ else
+ return shift_ <= shiftTolerance_
+ || reduction_ <= reductionTolerance_;
+ }
else
{
return shift_ <= shiftTolerance_
--
GitLab