OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #409 from akva2/less_deck_blackoil_fluid_system

Browse Source 
changed: lessen deck usage setting up BlackoilFluidSystem
This commit is contained in:
Arne Morten Kvarving 2020-03-03 15:57:05 +01:00 committed by GitHub
commit 43232d878f
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
opm/material/fluidsystems/BlackOilFluidSystem.hpp
View File

@ -40,6 +40,12 @@
#include <opm/material/common/HasMemberGeneratorMacros.hpp>
#include <opm/material/common/Exceptions.hpp>
#if HAVE_ECL_INPUT
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/FlatTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#endif
#include <memory>
#include <vector>
#include <array>
@ -177,24 +183,25 @@ public:
*/
static void initFromDeck(const Deck& deck, const EclipseState& eclState)
{
auto densityKeyword = deck.getKeyword("DENSITY");
size_t numRegions = densityKeyword.size();
const auto& densityTable = eclState.getTableManager().getDensityTable();
size_t numRegions = densityTable.size();
initBegin(numRegions);
numActivePhases_ = 0;
std::fill_n(&phaseIsActive_[0], numPhases, false);
if (deck.hasKeyword("OIL")) {
if (eclState.runspec().phases().active(Phase::OIL)) {
phaseIsActive_[oilPhaseIdx] = true;
++ numActivePhases_;
}
if (deck.hasKeyword("GAS")) {
if (eclState.runspec().phases().active(Phase::GAS)) {
phaseIsActive_[gasPhaseIdx] = true;
++ numActivePhases_;
}
if (deck.hasKeyword("WATER")) {
if (eclState.runspec().phases().active(Phase::WATER)) {
phaseIsActive_[waterPhaseIdx] = true;
++ numActivePhases_;
}
@ -210,15 +217,14 @@ public:
// this fluidsystem only supports two or three phases
assert(numActivePhases_ >= 1 && numActivePhases_ <= 3);
setEnableDissolvedGas(deck.hasKeyword("DISGAS"));
setEnableVaporizedOil(deck.hasKeyword("VAPOIL"));
setEnableDissolvedGas(eclState.getSimulationConfig().hasDISGAS());
setEnableVaporizedOil(eclState.getSimulationConfig().hasVAPOIL());
// set the reference densities of all PVT regions
for (unsigned regionIdx = 0; regionIdx < numRegions; ++regionIdx) {
const auto& densityRecord = densityKeyword.getRecord(regionIdx);
setReferenceDensities(densityRecord.getItem("OIL").getSIDouble(0),
densityRecord.getItem("WATER").getSIDouble(0),
densityRecord.getItem("GAS").getSIDouble(0),
setReferenceDensities(densityTable[regionIdx].oil,
densityTable[regionIdx].water,
densityTable[regionIdx].gas,
regionIdx);
}