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

Merge pull request #1373 from totto82/useBlackoilFluidState

Browse Source 
Adapt to changed initial FluidState type in ebos
This commit is contained in:
Andreas Lauser 2017-12-18 13:02:33 +01:00 committed by GitHub
commit 025bbd3da2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -1340,12 +1340,11 @@ namespace Opm {
// Volume factors, densities and viscosities need to be recalculated with the updated rs and rv values. // Volume factors, densities and viscosities need to be recalculated with the updated rs and rv values.
if (ebosSimulator_.episodeIndex() < 0 && vapour_active && liquid_active ) { if (ebosSimulator_.episodeIndex() < 0 && vapour_active && liquid_active ) {
typedef Opm::CompositionalFluidState<Scalar, FluidSystem> ScalarFluidState; const auto& fs_updated = ebosSimulator().problem().initialFluidState(cellIdx);
const ScalarFluidState& fs_updated = ebosSimulator().problem().initialFluidState(cellIdx);
// use initial rs and rv values // use initial rs and rv values
Rv[cellIdx] = Opm::BlackOil::getRv_<FluidSystem, Scalar, ScalarFluidState>(fs_updated, intQuants.pvtRegionIndex()); Rv[cellIdx] = fs_updated.Rv();
Rs[cellIdx] = Opm::BlackOil::getRs_<FluidSystem, Scalar, ScalarFluidState>(fs_updated, intQuants.pvtRegionIndex()); Rs[cellIdx] = fs_updated.Rs();
//re-compute the volume factors, viscosities and densities. //re-compute the volume factors, viscosities and densities.
rhoOil[cellIdx] = FluidSystem::density(fs_updated, rhoOil[cellIdx] = FluidSystem::density(fs_updated,