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

generalize single-phase fix

Browse Source
This commit is contained in:
Cintia Goncalves Machado 2020-11-25 17:48:45 +01:00
parent 1d4dd874ca
commit 5513bff1ba
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,15 +178,15 @@ struct EclEpsScalingPointsInfo
bool hasGas = eclState.runspec().phases().active(Phase::GAS); bool hasGas = eclState.runspec().phases().active(Phase::GAS);
bool hasOil = eclState.runspec().phases().active(Phase::OIL); 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; Swl = 0.0;
Swu = 0.0; Swu = 0.0;
Swcr = 0.0; Swcr = 0.0;
bool family1 = (!sgofTables.empty() || !slgofTables.empty()); bool family1 = (!sgofTables.empty() || !slgofTables.empty());
bool family2 = !sgfnTables.empty() && !sof2Tables.empty(); bool family2 = !sgfnTables.empty() && !sof2Tables.empty();
if (!hasOil) { if (family1) {
return;
} else if (family1) {
if (!sgofTables.empty()) if (!sgofTables.empty())
extractUnscaledSgof_(sgofTables.getTable<SgofTable>(satRegionIdx)); extractUnscaledSgof_(sgofTables.getTable<SgofTable>(satRegionIdx));
else { else {
@ -201,16 +201,13 @@ struct EclEpsScalingPointsInfo
throw std::domain_error("No valid saturation keyword family specified"); throw std::domain_error("No valid saturation keyword family specified");
} }
return; return;
} } else if (!hasGas) {
else if (!hasGas) {
Sgl = 0.0; Sgl = 0.0;
Sgu = 0.0; Sgu = 0.0;
Sgcr = 0.0; Sgcr = 0.0;
bool family1 = !swofTables.empty(); bool family1 = !swofTables.empty();
bool family2 = !swfnTables.empty() && !sof2Tables.empty(); bool family2 = !swfnTables.empty() && !sof2Tables.empty();
if (!hasOil) { if (family1) {
return;
} else if (family1) {
extractUnscaledSwof_(swofTables.getTable<SwofTable>(satRegionIdx)); extractUnscaledSwof_(swofTables.getTable<SwofTable>(satRegionIdx));
} else if (family2) { } else if (family2) {
extractUnscaledSwfn_(swfnTables.getTable<SwfnTable>(satRegionIdx)); extractUnscaledSwfn_(swfnTables.getTable<SwfnTable>(satRegionIdx));