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

Merge pull request #1775 from totto82/fixSolvent

Browse Source 
Allow for mixing of SOF2 from familiy 2 and family 1 for 3p + solvent
This commit is contained in:
Bård Skaflestad 2020-05-05 15:14:44 +02:00 committed by GitHub
commit 26cdff10fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/opm/parser/eclipse/EclipseState/Grid/SatfuncPropertyInitializers.cpp
View File

@ -81,16 +81,19 @@ namespace {
const auto wat = ph.active(::Opm::Phase::WATER);
const auto oil = ph.active(::Opm::Phase::OIL);
const auto gas = ph.active(::Opm::Phase::GAS);
const auto threeP = gas && oil && wat;
const auto twoP = (!gas && oil && wat) || (gas && oil && !wat) ;
const auto family1 = // SGOF/SLGOF and/or SWOF
(gas && (tm.hasTables("SGOF") || tm.hasTables("SLGOF"))) ||
(wat && tm.hasTables("SWOF"));
// note: we allow for SOF2 to be part of family1 for threeP + solvent simulations.
const auto family2 = // SGFN, SOF{2,3}, SWFN
(gas && tm.hasTables("SGFN")) ||
(oil && ((threeP && tm.hasTables("SOF3")) ||
tm.hasTables("SOF2"))) ||
(twoP && tm.hasTables("SOF2")))) ||
(wat && tm.hasTables("SWFN"));
if (gas && tm.hasTables("SGOF") && tm.hasTables("SLGOF")) {