OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge d2b69158bd into 9a0ccfd853

Browse Source
This commit is contained in:
Vegard Kippe 2023-11-26 11:24:07 +00:00 committed by GitHub
commit 0ab3bcd3f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opm/material/fluidmatrixinteractions/EclMaterialLawManager.cpp
View File

@ -178,8 +178,8 @@ applySwatinit(unsigned elemIdx,
Scalar pcowAtSw = pc[oilPhaseIdx] - pc[waterPhaseIdx];
constexpr const Scalar pcowAtSwThreshold = 1.0; //Pascal
// avoid divison by very small number
if (std::abs(pcowAtSw) > pcowAtSwThreshold) {
// avoid divison by very small number and avoid negative PCW at connate Sw
if (pcowAtSw > pcowAtSwThreshold) {
// Scale max. capillary pressure to honor SWATINIT value
Scalar newMaxPcow = elemScaledEpsInfo.maxPcow * (pcow/pcowAtSw);
@ -206,6 +206,8 @@ applySwatinit(unsigned elemIdx,
*oilWaterEclEpsConfig_,
EclTwoPhaseSystemType::OilWater);
}
// Find Sw from unscaled curve if PCW at connate Sw would be negative (i.e., do no respect SWATINIT in this case)
if (pcowAtSw < 0.0) newSwatInit = true;
}
return {Sw, newSwatInit};