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

Merge pull request #4310 from bska/show-unscaled-if-eps-missing

Browse Source 
Don't Calculate Scaled Curves if EPS Data Unavailable
This commit is contained in:
Magne Sjaastad 2019-04-11 08:11:45 +02:00 committed by GitHub
commit 61b8824bdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ThirdParty/custom-opm-flowdiag-app/opm-flowdiagnostics-applications/opm/utility/ECLSaturationFunc.cpp vendored
View File

@ -1420,6 +1420,8 @@ private:
std::unique_ptr<Gas::SatFunction> gas_{nullptr};
std::unique_ptr<Water::SatFunction> wat_{nullptr};
bool haveEPSData_{false};
std::unique_ptr<EPSEvaluator> eps_{nullptr};
std::unique_ptr<const ECLUnits::UnitSystem> usys_output_{nullptr};
@ -1616,10 +1618,9 @@ Opm::ECLSaturationFunc::Impl::init(const ECLGraph& G,
// Activate saturation function scaling if present in result set.
const auto& lh = init.keywordData<bool>(LOGIHEAD_KW);
const auto haveEPS = static_cast<bool>(
lh[LOGIHEAD_ENDPOINT_SCALING_INDEX]);
this->haveEPSData_ = lh[LOGIHEAD_ENDPOINT_SCALING_INDEX];
if (haveEPS) {
if (this->haveEPSData_) {
const auto use3PtScaling = static_cast<bool>(
lh[LOGIHEAD_ALT_ENDPOINT_SCALING_INDEX]);
@ -2466,7 +2467,7 @@ max2PSatSum(const RawCurve& fi,
if (fi.subsys == RawCurve::SubSystem::OilGas) {
// Max 2p Saturation sum = 1 - SWL
if (enableHorizontalEPS(scaling)) {
if (this->haveEPSData_ && enableHorizontalEPS(scaling)) {
if (this->eps_ != nullptr) {
smin = this->eps_->scaledConnateWater(cell);
}
@ -2486,7 +2487,7 @@ max2PSatSum(const RawCurve& fi,
}
else {
// Max 2p Saturation sum = 1 - SGL (almost always = 1)
if (enableHorizontalEPS(scaling)) {
if (this->haveEPSData_ && enableHorizontalEPS(scaling)) {
if (this->eps_ != nullptr) {
smin = this->eps_->scaledConnateGas(cell);
}