OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

newtonmethod: move parameters to dedicated struct with a translation unit

Browse Source
This commit is contained in:
Arne Morten Kvarving
2024-09-16 08:43:09 +02:00
parent 1b19fa02f4
commit 3ee3dc2b5f
6 changed files with 122 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flowexperimental/FlowExpNewtonMethod.hpp
View File

@@ -149,7 +149,7 @@ public:
{
const auto& constraintsMap = this->model().linearizer().constraintsMap();
this->lastError_ = this->error_;
Scalar newtonMaxError = Parameters::Get<Parameters::NewtonMaxError<Scalar>>();
Scalar newtonMaxError = this->params_.maxError_;
// calculate the error as the maximum weighted tolerance of
// the solution's residual
@@ -198,7 +198,7 @@ public:
this->error_ = max(std::abs(tmpError), this->error_);
if (std::abs(tmpError) > this->tolerance_) {
if (std::abs(tmpError) > this->params_.tolerance_) {
cnvViolated = true;
}
@@ -231,7 +231,7 @@ public:
Scalar y = Parameters::Get<Parameters::EclNewtonSumToleranceExponent<Scalar>>();
sumTolerance_ = x*std::pow(sumPv, y);
this->endIterMsg() << " (max: " << this->tolerance_
this->endIterMsg() << " (max: " << this->params_.tolerance_
<< ", violated for " << errorPvFraction_ * 100
<< "% of the pore volume), aggegate error: "
<< errorSum_ << " (max: " << sumTolerance_ << ")";