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

Merge pull request #432 from goncalvesmachadoc/aquifer

Browse Source 
Do not check for kr curves for water single-phase
This commit is contained in:
Atgeirr Flø Rasmussen 2020-12-01 08:38:02 +01:00 committed by GitHub
commit e58a660235
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp
View File

@ -178,7 +178,9 @@ struct EclEpsScalingPointsInfo
bool hasGas = eclState.runspec().phases().active(Phase::GAS);
bool hasOil = eclState.runspec().phases().active(Phase::OIL);
if (!hasWater) {
if (int(hasWater) + int(hasGas) + int(hasOil) == 1) {
return;
} else if (!hasWater) {
Swl = 0.0;
Swu = 0.0;
Swcr = 0.0;
@ -199,8 +201,7 @@ struct EclEpsScalingPointsInfo
throw std::domain_error("No valid saturation keyword family specified");
}
return;
}
else if (!hasGas) {
} else if (!hasGas) {
Sgl = 0.0;
Sgu = 0.0;
Sgcr = 0.0;