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

Changed satRange() behaviour to use highest sw in SWOF as max (instead of 1.0).

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-04-12 13:52:41 +02:00
parent 74653b42d2
commit d0eb42c5d8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/core/fluid/SaturationPropsFromDeck.cpp
View File

@ -43,6 +43,7 @@ namespace Opm
} }
const int samples = 200; const int samples = 200;
double swco = 0.0; double swco = 0.0;
double swmax = 1.0;
if (phase_usage_.phase_used[Aqua]) { if (phase_usage_.phase_used[Aqua]) {
const SWOF::table_t& swof_table = deck.getSWOF().swof_; const SWOF::table_t& swof_table = deck.getSWOF().swof_;
if (swof_table.size() != 1) { if (swof_table.size() != 1) {
@ -58,7 +59,8 @@ namespace Opm
krocw_ = krow[0]; // At connate water -> ecl. SWOF krocw_ = krow[0]; // At connate water -> ecl. SWOF
swco = sw[0]; swco = sw[0];
smin_[phase_usage_.phase_pos[Aqua]] = sw[0]; smin_[phase_usage_.phase_pos[Aqua]] = sw[0];
smax_[phase_usage_.phase_pos[Aqua]] = 1.0; swmax = sw.back();
smax_[phase_usage_.phase_pos[Aqua]] = sw.back();
} }
if (phase_usage_.phase_used[Vapour]) { if (phase_usage_.phase_used[Vapour]) {
const SGOF::table_t& sgof_table = deck.getSGOF().sgof_; const SGOF::table_t& sgof_table = deck.getSGOF().sgof_;
@ -79,7 +81,8 @@ namespace Opm
} }
smax_[phase_usage_.phase_pos[Vapour]] = sg.back(); smax_[phase_usage_.phase_pos[Vapour]] = sg.back();
} }
smin_[phase_usage_.phase_pos[Liquid]] = 0.0; // These only consider water min/max sats. Consider gas sats?
smin_[phase_usage_.phase_pos[Liquid]] = 1.0 - swmax;
smax_[phase_usage_.phase_pos[Liquid]] = 1.0 - swco; smax_[phase_usage_.phase_pos[Liquid]] = 1.0 - swco;
} }