OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-08-03 04:00:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5337 from bska/relaxed-not-tighter-than-strict

Browse Source 
Enforce Relaxed Tolerances Not Stricter Than Strict
This commit is contained in:
Atgeirr Flø Rasmussen
2024-05-08 10:23:04 +02:00
committed by GitHub
parent 66131bd350 cc28bbe989
commit 40b3cc049c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/simulators/flow/BlackoilModelParameters.hpp
+3 -2
View File
@@ -28,6 +28,7 @@
#include <opm/simulators/flow/SubDomain.hpp>
#include <algorithm>
#include <stdexcept>
#include <string>
@@ -624,9 +625,9 @@ namespace Opm
max_residual_allowed_ = Parameters::get<TypeTag, Properties::MaxResidualAllowed>();
relaxed_max_pv_fraction_ = Parameters::get<TypeTag, Properties::RelaxedMaxPvFraction>();
tolerance_mb_ = Parameters::get<TypeTag, Properties::ToleranceMb>();
tolerance_mb_relaxed_ = Parameters::get<TypeTag, Properties::ToleranceMbRelaxed>();
tolerance_mb_relaxed_ = std::max(tolerance_mb_, Parameters::get<TypeTag, Properties::ToleranceMbRelaxed>());
tolerance_cnv_ = Parameters::get<TypeTag, Properties::ToleranceCnv>();
tolerance_cnv_relaxed_ = Parameters::get<TypeTag, Properties::ToleranceCnvRelaxed>();
tolerance_cnv_relaxed_ = std::max(tolerance_cnv_, Parameters::get<TypeTag, Properties::ToleranceCnvRelaxed>());
tolerance_wells_ = Parameters::get<TypeTag, Properties::ToleranceWells>();
tolerance_well_control_ = Parameters::get<TypeTag, Properties::ToleranceWellControl>();
max_welleq_iter_ = Parameters::get<TypeTag, Properties::MaxWelleqIter>();