adapt to the reference pressure != surface pressure change in opm-material

This commit is contained in:
Andreas Lauser 2014-08-12 15:49:47 +02:00
parent 3d3ba3ac30
commit 6528a88e90
2 changed files with 7 additions and 6 deletions

View File

@ -901,9 +901,10 @@ protected:
// chosen the correct fluid system. Currently, // chosen the correct fluid system. Currently,
// only Opm::FluidSystems::BlackOil is supported, // only Opm::FluidSystems::BlackOil is supported,
// sorry... // sorry...
Scalar rhoOilSurface = FluidSystem::surfaceDensity(oilPhaseIdx, /*regionIdx=*/0); Scalar pSurface = FluidSystem::surfacePressure;
Scalar rhoGasSurface = FluidSystem::surfaceDensity(gasPhaseIdx, /*regionIdx=*/0); Scalar rhoOilSurface = FluidSystem::oilDensity(pSurface, /*XoG=*/0, /*regionIdx=*/0);
Scalar rhoWaterSurface = FluidSystem::surfaceDensity(waterPhaseIdx, /*regionIdx=*/0); Scalar rhoGasSurface = FluidSystem::gasDensity(pSurface, /*regionIdx=*/0);
Scalar rhoWaterSurface = FluidSystem::waterDensity(pSurface, /*regionIdx=*/0);
// oil // oil
surfaceRates[oilPhaseIdx] = surfaceRates[oilPhaseIdx] =

View File

@ -676,7 +676,7 @@ private:
// set the reference densities // set the reference densities
Opm::DeckRecordConstPtr densityRecord = Opm::DeckRecordConstPtr densityRecord =
deck->getKeyword("DENSITY")->getRecord(regionIdx); 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("WATER")->getSIDouble(0),
densityRecord->getItem("GAS")->getSIDouble(0), densityRecord->getItem("GAS")->getSIDouble(0),
regionIdx); regionIdx);
@ -816,8 +816,8 @@ private:
// calculate composition of the real and the saturated oil phase in terms of // calculate composition of the real and the saturated oil phase in terms of
// mass fractions. // mass fractions.
Scalar rhooRef = FluidSystem::surfaceDensity(oilPhaseIdx, /*regionIdx=*/0); Scalar rhooRef = FluidSystem::referenceDensity(oilPhaseIdx, /*regionIdx=*/0);
Scalar rhogRef = FluidSystem::surfaceDensity(gasPhaseIdx, /*regionIdx=*/0); Scalar rhogRef = FluidSystem::referenceDensity(gasPhaseIdx, /*regionIdx=*/0);
Scalar XoGReal = RsReal*rhogRef / (RsReal*rhogRef + rhooRef); Scalar XoGReal = RsReal*rhogRef / (RsReal*rhogRef + rhooRef);
// convert mass to mole fractions // convert mass to mole fractions