From 7e765a1ca50ef08d01dd64b4034ccb65593b9a7f Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Wed, 6 Dec 2017 15:30:18 +0100 Subject: [PATCH] equil init: remove usage of saturated*() low level PVT functions hopefully, these can be removed soon. --- opm/core/simulator/initStateEquil_impl.hpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/opm/core/simulator/initStateEquil_impl.hpp b/opm/core/simulator/initStateEquil_impl.hpp index ef5d6996..193668c0 100644 --- a/opm/core/simulator/initStateEquil_impl.hpp +++ b/opm/core/simulator/initStateEquil_impl.hpp @@ -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); }