From 9a7b068d151fb1f6710362dcad8dd3e5fc1137ca Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Thu, 24 Apr 2014 17:07:41 +0200 Subject: [PATCH] Implement multi-region PVT for all property classes since they are not using a single PVT table anymore, their "Single" prefix has been removed... --- opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp | 2 +- opm/core/simulator/initStateEquil.hpp | 2 +- tests/liveoil.DATA | 13 +++++++++++++ tests/wetgas.DATA | 13 +++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp index c4c764acf..e23839e91 100644 --- a/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp +++ b/opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp @@ -35,7 +35,7 @@ namespace Opm void PvtPropertiesIncompFromDeck::init(Opm::DeckConstPtr deck ) { - // If we need multiple regions, this class and the SinglePvt* classes must change. + // If we need multiple regions, this class and the Pvt* classes must change. int region_number = 0; PhaseUsage phase_usage = phaseUsageFromDeck(deck); diff --git a/opm/core/simulator/initStateEquil.hpp b/opm/core/simulator/initStateEquil.hpp index 1cf88ee48..e5f8c8ec2 100644 --- a/opm/core/simulator/initStateEquil.hpp +++ b/opm/core/simulator/initStateEquil.hpp @@ -279,7 +279,7 @@ namespace Opm if (rec[i].live_oil_table_index > 0) { if (deck->hasKeyword("RSVD") && size_t(rec[i].live_oil_table_index) <= deck->getKeyword("RSVD")->size()) { - Opm::SingleRecordTable rsvd(deck->getKeyword("RSVD"),std::vector{"vd", "rs"},rec[i].live_oil_table_index-1); + Opm::SingleRecordTable rsvd(deck->getKeyword("RSVD"),std::vector{"vd", "rs"},rec[i].live_oil_table_index-1); std::vector vd(rsvd.getColumn("vd")); std::vector rs(rsvd.getColumn("rs")); rs_func_.push_back(std::make_shared(props, cell, vd, rs)); diff --git a/tests/liveoil.DATA b/tests/liveoil.DATA index 48fcafe6b..b3c3e271f 100644 --- a/tests/liveoil.DATA +++ b/tests/liveoil.DATA @@ -9,6 +9,19 @@ WATER FIELD +-- tests for the PVT functions need a grid because the OPM-API for the +-- PVT functions assumes the presence of compressed grid cells, +-- i.e. we need to be able to map from compressed to logical cartesian +-- cell indices to find out the PVT region of a cell +DIMENS +3 3 3 / +DXV +1 2 3 / +DYV +1 2 3 / +DZV +1 2 3 / + PVTO -- Rs Pbub Bo Vo .0 14.7 1.0000 1.20 / diff --git a/tests/wetgas.DATA b/tests/wetgas.DATA index 3c094dc16..1a98a9752 100644 --- a/tests/wetgas.DATA +++ b/tests/wetgas.DATA @@ -9,6 +9,19 @@ GAS FIELD +-- tests for the PVT functions need a grid because the OPM-API for the +-- PVT functions assumes the presence of compressed grid cells, +-- i.e. we need to be able to map from compressed to logical cartesian +-- cell indices to find out the PVT region of a cell +DIMENS +3 3 3 / +DXV +1 2 3 / +DYV +1 2 3 / +DZV +1 2 3 / + -- PVT PROPERTIES OF DRY GAS (NO VAPOURISED OIL) -- FROM SPE3 Blackoil Kleppe --