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

BlackoilPropsAdFromDeck: Add support for PVTO

Browse Source
This commit is contained in:
Andreas Lauser 2014-01-16 16:45:46 +01:00
parent 6b0e1d4562
commit f7541aa27a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opm/autodiff/BlackoilPropsAdFromDeck.cpp
View File

@ -34,6 +34,7 @@
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Utility/PvdoTable.hpp> #include <opm/parser/eclipse/Utility/PvdoTable.hpp>
#include <opm/parser/eclipse/Utility/PvtgTable.hpp>
#include <opm/parser/eclipse/Utility/PvdcoTable.hpp> #include <opm/parser/eclipse/Utility/PvdcoTable.hpp>
namespace Opm namespace Opm
@ -186,7 +187,7 @@ namespace Opm
props_[phase_usage_.phase_pos[Liquid]].reset(new SinglePvtDead(pvdoTable)); props_[phase_usage_.phase_pos[Liquid]].reset(new SinglePvtDead(pvdoTable));
} }
else if (newParserDeck->hasKeyword("PVTO")) { else if (newParserDeck->hasKeyword("PVTO")) {
Opm::PvtoTable pvtoTable(newParserDeck->getKeyword("PVTO")); Opm::PvtoTable pvtoTable(newParserDeck->getKeyword("PVTO"), /*tableIdx=*/0);
props_[phase_usage_.phase_pos[Liquid]].reset(new SinglePvtLiveOil(pvtoTable)); props_[phase_usage_.phase_pos[Liquid]].reset(new SinglePvtLiveOil(pvtoTable));
} else if (newParserDeck->hasKeyword("PVCDO")) { } else if (newParserDeck->hasKeyword("PVCDO")) {
@ -204,8 +205,12 @@ namespace Opm
Opm::PvdoTable pvdgTable(newParserDeck->getKeyword("PVDG"), region_number); Opm::PvdoTable pvdgTable(newParserDeck->getKeyword("PVDG"), region_number);
props_[phase_usage_.phase_pos[Vapour]].reset(new SinglePvtDead(pvdgTable)); props_[phase_usage_.phase_pos[Vapour]].reset(new SinglePvtDead(pvdgTable));
} else if (newParserDeck->hasKeyword("PVTG")) {
Opm::PvtgTable pvtgTable(newParserDeck->getKeyword("PVTG"), /*tableIdx=*/0);
props_[phase_usage_.phase_pos[Vapour]].reset(new SinglePvtLiveGas(pvtgTable));
} else { } else {
OPM_THROW(std::runtime_error, "Input is missing PVDG\n"); OPM_THROW(std::runtime_error, "Input is missing PVDG or PVTG\n");
} }
} }