mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-01-08 23:43:02 -06:00
adapt to the reference pressure != surface pressure change in opm-material
This commit is contained in:
parent
3d3ba3ac30
commit
6528a88e90
@ -901,9 +901,10 @@ protected:
|
||||
// chosen the correct fluid system. Currently,
|
||||
// only Opm::FluidSystems::BlackOil is supported,
|
||||
// sorry...
|
||||
Scalar rhoOilSurface = FluidSystem::surfaceDensity(oilPhaseIdx, /*regionIdx=*/0);
|
||||
Scalar rhoGasSurface = FluidSystem::surfaceDensity(gasPhaseIdx, /*regionIdx=*/0);
|
||||
Scalar rhoWaterSurface = FluidSystem::surfaceDensity(waterPhaseIdx, /*regionIdx=*/0);
|
||||
Scalar pSurface = FluidSystem::surfacePressure;
|
||||
Scalar rhoOilSurface = FluidSystem::oilDensity(pSurface, /*XoG=*/0, /*regionIdx=*/0);
|
||||
Scalar rhoGasSurface = FluidSystem::gasDensity(pSurface, /*regionIdx=*/0);
|
||||
Scalar rhoWaterSurface = FluidSystem::waterDensity(pSurface, /*regionIdx=*/0);
|
||||
|
||||
// oil
|
||||
surfaceRates[oilPhaseIdx] =
|
||||
|
@ -676,7 +676,7 @@ private:
|
||||
// set the reference densities
|
||||
Opm::DeckRecordConstPtr densityRecord =
|
||||
deck->getKeyword("DENSITY")->getRecord(regionIdx);
|
||||
FluidSystem::setSurfaceDensities(densityRecord->getItem("OIL")->getSIDouble(0),
|
||||
FluidSystem::setReferenceDensities(densityRecord->getItem("OIL")->getSIDouble(0),
|
||||
densityRecord->getItem("WATER")->getSIDouble(0),
|
||||
densityRecord->getItem("GAS")->getSIDouble(0),
|
||||
regionIdx);
|
||||
@ -816,8 +816,8 @@ private:
|
||||
|
||||
// calculate composition of the real and the saturated oil phase in terms of
|
||||
// mass fractions.
|
||||
Scalar rhooRef = FluidSystem::surfaceDensity(oilPhaseIdx, /*regionIdx=*/0);
|
||||
Scalar rhogRef = FluidSystem::surfaceDensity(gasPhaseIdx, /*regionIdx=*/0);
|
||||
Scalar rhooRef = FluidSystem::referenceDensity(oilPhaseIdx, /*regionIdx=*/0);
|
||||
Scalar rhogRef = FluidSystem::referenceDensity(gasPhaseIdx, /*regionIdx=*/0);
|
||||
Scalar XoGReal = RsReal*rhogRef / (RsReal*rhogRef + rhooRef);
|
||||
|
||||
// convert mass to mole fractions
|
||||
|
Loading…
Reference in New Issue
Block a user