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

Merge pull request #5566 from atgeirr/fix-cpp20ism

Browse Source 
Avoid capturing structured bindings.
This commit is contained in:
Bård Skaflestad 2024-08-30 14:31:27 +02:00 committed by GitHub
commit a84359c1f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/simulators/flow/BlackoilModel.hpp
View File

@ -975,14 +975,14 @@ namespace Opm {
// semicolon. This is an immediately invoked function // semicolon. This is an immediately invoked function
// expression which calculates a single boolean value. // expression which calculates a single boolean value.
const auto relax_pv_fraction_cnv = const auto relax_pv_fraction_cnv =
[&report, pvSum, numAquiferPvSum, this]() [&report, this, eligible = pvSum - numAquiferPvSum]()
{ {
const auto& cnvPvSplit = report.cnvPvSplit().first; const auto& cnvPvSplit = report.cnvPvSplit().first;
// [1]: tol < cnv <= relaxed // [1]: tol < cnv <= relaxed
// [2]: relaxed < cnv // [2]: relaxed < cnv
return static_cast<Scalar>(cnvPvSplit[1] + cnvPvSplit[2]) < return static_cast<Scalar>(cnvPvSplit[1] + cnvPvSplit[2]) <
this->param_.relaxed_max_pv_fraction_ * (pvSum - numAquiferPvSum); this->param_.relaxed_max_pv_fraction_ * eligible;
}(); }();
const bool use_relaxed_cnv = relax_final_iteration_cnv const bool use_relaxed_cnv = relax_final_iteration_cnv