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 9d7cac49f5
commit b76a77128c
2 changed files with 4 additions and 9 deletions

View File

@ -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

View File

@ -243,9 +243,7 @@ public:
{ 6.21542e+07, 4.7e-05 }
};
FluidSystem::setSurfaceDensities(/*oil=*/720.51,
/*water=*/1009.32,
/*gas=*/1.1245);
FluidSystem::setReferenceDensities(/*oil=*/786, /*water=*/1037, /*gas=*/0.97);
FluidSystem::setGasFormationVolumeFactor(Bg);
FluidSystem::setSaturatedOilGasDissolutionFactor(Rs);
FluidSystem::setSaturatedOilFormationVolumeFactor(Bo);
@ -253,9 +251,6 @@ public:
FluidSystem::setGasViscosity(mug);
FluidSystem::setWaterViscosity(9.6e-4);
FluidSystem::setWaterCompressibility(1.450377e-10);
FluidSystem::setSurfaceDensities(/*oil=*/786,
/*water=*/1037,
/*gas=*/0.97);
FluidSystem::initEnd();
pReservoir_ = 330e5;