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

equil init: remove usage of saturated*() low level PVT functions

Browse Source 
hopefully, these can be removed soon.
This commit is contained in:
Andreas Lauser 2017-12-06 15:30:18 +01:00
parent d97a5c5734
commit 7e765a1ca5
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/core/simulator/initStateEquil_impl.hpp
View File

@ -174,7 +174,9 @@ namespace Opm
double rs = rs_(depth, press, temp_);
double bOil = 0.0;
if ( !FluidSystem::enableDissolvedGas() || rs >= FluidSystem::oilPvt().saturatedGasDissolutionFactor(pvtRegionIdx_, temp_, press) ) {
bOil = FluidSystem::oilPvt().saturatedInverseFormationVolumeFactor(pvtRegionIdx_, temp_, press);
double RsSat =
FluidSystem::oilPvt().saturatedGasDissolutionFactor(pvtRegionIdx_, temp_, press);
bOil = FluidSystem::oilPvt().inverseFormationVolumeFactor(pvtRegionIdx_, temp_, press, RsSat);
} else {
bOil = FluidSystem::oilPvt().inverseFormationVolumeFactor(pvtRegionIdx_, temp_, press, rs);
}
@ -221,7 +223,9 @@ namespace Opm
double rv = rv_(depth, press, temp_);
double bGas = 0.0;
if ( !FluidSystem::enableVaporizedOil() || rv >= FluidSystem::gasPvt().saturatedOilVaporizationFactor(pvtRegionIdx_, temp_, press) ) {
bGas = FluidSystem::gasPvt().saturatedInverseFormationVolumeFactor(pvtRegionIdx_, temp_, press);
double RvSat =
FluidSystem::gasPvt().saturatedOilVaporizationFactor(pvtRegionIdx_, temp_, press);
bGas = FluidSystem::gasPvt().inverseFormationVolumeFactor(pvtRegionIdx_, temp_, press, RvSat);
} else {
bGas = FluidSystem::gasPvt().inverseFormationVolumeFactor(pvtRegionIdx_, temp_, press, rv);
}