adapt to the reworked blackoil fluid system and function tabulation classes

in particular, the density of undersaturated oil is now the one
specified by the PVTO keyword...
This commit is contained in:
Andreas Lauser 2014-07-09 11:57:48 +02:00
parent fe341d88cf
commit 2c3ebefc68

View File

@ -624,6 +624,12 @@ private:
FluidSystem::initBegin();
// set the reference densities
Opm::DeckRecordConstPtr densityRecord = deck->getKeyword("DENSITY")->getRecord(0);
FluidSystem::setSurfaceDensities(densityRecord->getItem("OIL")->getSIDouble(0),
densityRecord->getItem("WATER")->getSIDouble(0),
densityRecord->getItem("GAS")->getSIDouble(0));
// so far, we require the presence of the PVTO, PVTW and PVDG
// keywords...
Opm::PvtoTable pvtoTable(deck->getKeyword("PVTO"), /*tableIdx=*/0);
@ -634,15 +640,6 @@ private:
FluidSystem::setPvtwTable(pvtwTable);
FluidSystem::setPvdgTable(pvdgTable);
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
FluidSystem::setReferenceVolumeFactor(phaseIdx, 1.0);
// set the reference densities
Opm::DeckRecordConstPtr densityRecord = deck->getKeyword("DENSITY")->getRecord(0);
FluidSystem::setSurfaceDensities(densityRecord->getItem("OIL")->getSIDouble(0),
densityRecord->getItem("WATER")->getSIDouble(0),
densityRecord->getItem("GAS")->getSIDouble(0));
FluidSystem::initEnd();
}