Commit 019b0a81 authored by Martin Schneider's avatar Martin Schneider
Browse files

[newton] Converge if either shift or reduction is fulfilled

parent f79f693b
......@@ -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_
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment