OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Implement multi-region PVT for all property classes

Browse Source 
since they are not using a single PVT table anymore, their "Single"
prefix has been removed...
This commit is contained in:
Andreas Lauser 2014-04-24 17:07:41 +02:00
parent 6a50afb219
commit 9a7b068d15
4 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/core/props/pvt/PvtPropertiesIncompFromDeck.cpp
View File

@ -35,7 +35,7 @@ namespace Opm
void PvtPropertiesIncompFromDeck::init(Opm::DeckConstPtr deck ) 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; int region_number = 0;
PhaseUsage phase_usage = phaseUsageFromDeck(deck); PhaseUsage phase_usage = phaseUsageFromDeck(deck);

2
opm/core/simulator/initStateEquil.hpp
View File

@ -279,7 +279,7 @@ namespace Opm
if (rec[i].live_oil_table_index > 0) { if (rec[i].live_oil_table_index > 0) {
if (deck->hasKeyword("RSVD") && if (deck->hasKeyword("RSVD") &&
size_t(rec[i].live_oil_table_index) <= deck->getKeyword("RSVD")->size()) { size_t(rec[i].live_oil_table_index) <= deck->getKeyword("RSVD")->size()) {
Opm::SingleRecordTable rsvd(deck->getKeyword("RSVD"),std::vector<std::string>{"vd", "rs"},rec[i].live_oil_table_index-1); Opm::SingleRecordTable rsvd(deck->getKeyword("RSVD"),std::vector<std::string>{"vd", "rs"},rec[i].live_oil_table_index-1);
std::vector<double> vd(rsvd.getColumn("vd")); std::vector<double> vd(rsvd.getColumn("vd"));
std::vector<double> rs(rsvd.getColumn("rs")); std::vector<double> rs(rsvd.getColumn("rs"));
rs_func_.push_back(std::make_shared<Miscibility::RsVD>(props, cell, vd, rs)); rs_func_.push_back(std::make_shared<Miscibility::RsVD>(props, cell, vd, rs));

13
tests/liveoil.DATA
View File

@ -9,6 +9,19 @@ WATER
FIELD 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 PVTO
-- Rs Pbub Bo Vo -- Rs Pbub Bo Vo
.0 14.7 1.0000 1.20 / .0 14.7 1.0000 1.20 /

13
tests/wetgas.DATA
View File

@ -9,6 +9,19 @@ GAS
FIELD 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) -- PVT PROPERTIES OF DRY GAS (NO VAPOURISED OIL)
-- FROM SPE3 Blackoil Kleppe -- FROM SPE3 Blackoil Kleppe
-- --