OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-29 01:14:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to changes related to hydroCarbonState

Browse Source
This commit is contained in:
Tor Harald Sandve 2016-05-19 11:25:27 +02:00
parent 03d6dde203
commit bd0ad6aa5b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opm/autodiff/BlackoilSolventModel_impl.hpp
View File

@ -532,7 +532,8 @@ namespace Opm {
auto watOnly = sw > (1 - epsilon); auto watOnly = sw > (1 - epsilon);
// phase translation sg <-> rs // phase translation sg <-> rs
std::fill(primalVariable_.begin(), primalVariable_.end(), PrimalVariables::Sg); std::vector<HydroCarbonState>& hydroCarbonState = reservoir_state.hydroCarbonState();
std::fill(hydroCarbonState.begin(), hydroCarbonState.end(), HydroCarbonState::GasAndOil);
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_);
@ -548,7 +549,7 @@ namespace Opm {
if (useSg[c]) { if (useSg[c]) {
rs[c] = rsSat[c]; rs[c] = rsSat[c];
} else { } else {
primalVariable_[c] = PrimalVariables::RS; hydroCarbonState[c] = HydroCarbonState::OilOnly;
} }
} }
@ -574,7 +575,7 @@ namespace Opm {
if (useSg[c]) { if (useSg[c]) {
rv[c] = rvSat[c]; rv[c] = rvSat[c];
} else { } else {
primalVariable_[c] = PrimalVariables::RV; hydroCarbonState[c] = HydroCarbonState::GasOnly;
} }
} }
} }
@ -615,7 +616,7 @@ namespace Opm {
Base::updateWellState(dwells,well_state); Base::updateWellState(dwells,well_state);
// Update phase conditions used for property calculations. // Update phase conditions used for property calculations.
updatePhaseCondFromPrimalVariable(); updatePhaseCondFromPrimalVariable(reservoir_state);
} }