Commit 009a0fdf authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'feature/newton-converged-shift-or-reduction' into 'master'

Feature/newton converged shift or reduction

See merge request !1718
parents 72c5b472 019b0a81
......@@ -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_
......
Supports Markdown
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