Commit 6f335324 authored by Beatrix Becker's avatar Beatrix Becker
Browse files

remove deprecated warnings (newtonUpdateRelError to newtonUpdateShift,

tolerance_ to shiftTolerance_), reviewed by Thomas


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14498 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 55f491bc
...@@ -199,13 +199,13 @@ public: ...@@ -199,13 +199,13 @@ public:
const SolutionVector &deltaU) const SolutionVector &deltaU)
{ {
if (this->enableShiftCriterion_ || this->enablePartialReassemble_) if (this->enableShiftCriterion_ || this->enablePartialReassemble_)
this->newtonUpdateRelError(uLastIter, deltaU); this->newtonUpdateShift(uLastIter, deltaU);
// compute the vertex and element colors for partial // compute the vertex and element colors for partial
// reassembly // reassembly
if (this->enablePartialReassemble_) { if (this->enablePartialReassemble_) {
const Scalar minReasmTol = 1e-2*this->tolerance_; const Scalar minReasmTol = 1e-2*this->shiftTolerance_;
const Scalar maxReasmTol = 1e1*this->tolerance_; const Scalar maxReasmTol = 1e1*this->shiftTolerance_;
Scalar reassembleTol = std::max(minReasmTol, std::min(maxReasmTol, this->shift_/1e4)); Scalar reassembleTol = std::max(minReasmTol, std::min(maxReasmTol, this->shift_/1e4));
this->model_().jacobianAssembler().updateDiscrepancy(uLastIter, deltaU); this->model_().jacobianAssembler().updateDiscrepancy(uLastIter, deltaU);
......
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