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

BUGFIX

Browse Source 
Updated solvent model after #825
Store rsSat and rvSat in simulator container for outut.
This commit is contained in:
Tor Harald Sandve 2016-09-19 11:10:14 +02:00
parent 51237cb960
commit cb5238f5dc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@ -220,17 +220,17 @@ namespace Opm {
if (active_[ Oil ]) { if (active_[ Oil ]) {
// RS and RV is only defined if both oil and gas phase are active. // RS and RV is only defined if both oil and gas phase are active.
state.canonical_phase_pressures = computePressures(state.pressure, state.saturation[pu.phase_pos[ Water ]], so, sg, state.solvent_saturation); state.canonical_phase_pressures = computePressures(state.pressure, state.saturation[pu.phase_pos[ Water ]], so, sg, state.solvent_saturation);
const ADB rsSat = fluidRsSat(state.canonical_phase_pressures[ Oil ], so , cells_); sd_.rsSat = fluidRsSat(state.canonical_phase_pressures[ Oil ], so , cells_);
if (has_disgas_) { if (has_disgas_) {
state.rs = (1-Base::isRs_)*rsSat + Base::isRs_*xvar; state.rs = (1-Base::isRs_)*sd_.rsSat + Base::isRs_*xvar;
} else { } else {
state.rs = rsSat; state.rs = sd_.rsSat;
} }
const ADB rvSat = fluidRvSat(state.canonical_phase_pressures[ Gas ], so , cells_); sd_.rvSat = fluidRvSat(state.canonical_phase_pressures[ Gas ], so , cells_);
if (has_vapoil_) { if (has_vapoil_) {
state.rv = (1-Base::isRv_)*rvSat + Base::isRv_*xvar; state.rv = (1-Base::isRv_)*sd_.rvSat + Base::isRv_*xvar;
} else { } else {
state.rv = rvSat; state.rv = sd_.rvSat;
} }
} }
} }
@ -549,6 +549,7 @@ namespace Opm {
if (has_disgas_) { if (has_disgas_) {
const V rsSat0 = fluidRsSat(p_old, s_old.col(pu.phase_pos[Oil]), cells_); const V rsSat0 = fluidRsSat(p_old, s_old.col(pu.phase_pos[Oil]), cells_);
const V rsSat = fluidRsSat(p, so, cells_); const V rsSat = fluidRsSat(p, so, cells_);
sd_.rsSat = ADB::constant(rsSat);
// The obvious case // The obvious case
auto hasGas = (sg > 0 && Base::isRs_ == 0); auto hasGas = (sg > 0 && Base::isRs_ == 0);
@ -574,6 +575,7 @@ namespace Opm {
const V gaspress = computeGasPressure(p, sw, so, sg); const V gaspress = computeGasPressure(p, sw, so, sg);
const V rvSat0 = fluidRvSat(gaspress_old, s_old.col(pu.phase_pos[Oil]), cells_); const V rvSat0 = fluidRvSat(gaspress_old, s_old.col(pu.phase_pos[Oil]), cells_);
const V rvSat = fluidRvSat(gaspress, so, cells_); const V rvSat = fluidRvSat(gaspress, so, cells_);
sd_.rvSat = ADB::constant(rvSat);
// The obvious case // The obvious case
auto hasOil = (so > 0 && Base::isRv_ == 0); auto hasOil = (so > 0 && Base::isRv_ == 0);