OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

check if the phase is present.

Browse Source
This commit is contained in:
Liu Ming
2016-09-05 16:14:27 +08:00
parent 1943978dbd
commit 170607e60c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@@ -2310,9 +2310,9 @@ namespace detail {
const DataBlock s = Eigen::Map<const DataBlock>(& x.saturation()[0], nc, np);
state.pressure = ADB::constant(Eigen::Map<const V>(& x.pressure()[0], nc, 1));
state.temperature = ADB::constant(Eigen::Map<const V>(& x.temperature()[0], nc, 1));
state.saturation[Water] = ADB::constant(s.col(Water));
state.saturation[Oil] = ADB::constant(s.col(Oil));
state.saturation[Gas] = ADB::constant(s.col(Gas));
state.saturation[Water] = active_[Water] ? ADB::constant(s.col(Water)) : ADB::null();
state.saturation[Oil] = active_[Oil] ? ADB::constant(s.col(Oil)) : ADB::constant(V::Zero(nc));
state.saturation[Gas] = active_[Gas] ? ADB::constant(s.col(Gas)) : ADB::constant(V::Zero(nc));
state.rs = ADB::constant(Eigen::Map<const V>(& x.gasoilratio()[0], nc, 1));
state.rv = ADB::constant(Eigen::Map<const V>(& x.rv()[0], nc, 1));
state.canonical_phase_pressures = computePressures(state.pressure,
@@ -2357,10 +2357,11 @@ namespace detail {
}
// compute PAV and PORV or every regions.
const V hydrocarbon = state.saturation[Oil].value() + state.saturation[Gas].value();
for (int c = 0; c < nc; ++c) {
if (fipnum[c] != 0) {
values[fipnum[c]-1][5] += pv[c] * (s.col(Gas)[c] + s.col(Oil)[c]);
values[fipnum[c]-1][6] += pv[c] * state.pressure.value()[c] * (s.col(Gas)[c] + s.col(Oil)[c]);
values[fipnum[c]-1][5] += pv[c] * hydrocarbon[c];
values[fipnum[c]-1][6] += pv[c] * state.pressure.value()[c] * hydrocarbon[c];
}
}