OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-02 05:49:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4335 from totto82/clampRSRV

Browse Source 
clamp rs/rv in rate converter between 0.0 and rs/rv max
This commit is contained in:
Tor Harald Sandve 2022-12-21 09:40:40 +01:00 committed by GitHub
commit 42093324ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
opm/simulators/wells/RateConverter.hpp
View File

@ -562,27 +562,6 @@ namespace Opm {
if ((io < 0) || (ig < 0)) {
return { rs, rv };
}
#define BURN_RESV_BRIDGES 0
#if !BURN_RESV_BRIDGES
auto b = rs;
if (io >= 0 && ig >= 0) {
b = surface_rates[ig] / (surface_rates[io] + 1.0e-15);
}
const double Rs = std::min(rs, b);
b = rv;
if (io >= 0 && ig >= 0) {
b = surface_rates[io] / (surface_rates[ig] + 1.0e-15);
}
const double Rv = std::min(rv, b);
return { Rs, Rv };
#else // BURN_RESV_BRIDGES
auto eps = std::copysign(1.0e-15, surface_rates[io]);
const auto Rs = surface_rates[ig] / (surface_rates[io] + eps);
@ -593,10 +572,6 @@ namespace Opm {
std::clamp(static_cast<double>(Rs), 0.0, rs),
std::clamp(static_cast<double>(Rv), 0.0, rv)
};
#endif // BURN_RESV_BRIDGES
#undef BURN_RESV_BRIDGES
}
};