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

Move VFP tables to Schedule.

Browse Source
This commit is contained in:
Joakim Hove
2018-04-06 12:12:30 +02:00
parent 936f5e5963
commit c37e5f9503
11 changed files with 89 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@@ -32,6 +32,7 @@
#include <opm/parser/eclipse/Deck/Section.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/C.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/V.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/W.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
@@ -92,6 +93,8 @@ namespace Opm {
if (Section::hasSCHEDULE(deck)) {
iterateScheduleSection( parseContext, SCHEDULESection( deck ), grid, eclipseProperties );
}
initVFPProdTables(deck, m_vfpprodTables);
initVFPInjTables(deck, m_vfpinjTables);
}
@@ -103,6 +106,58 @@ namespace Opm {
parse_context)
{}
void Schedule::initVFPProdTables(const Deck& deck,
std::map<int, VFPProdTable>& tableMap) {
if (!deck.hasKeyword(ParserKeywords::VFPPROD::keywordName)) {
return;
}
int num_tables = deck.count(ParserKeywords::VFPPROD::keywordName);
const auto& keywords = deck.getKeywordList<ParserKeywords::VFPPROD>();
const auto& unit_system = deck.getActiveUnitSystem();
for (int i=0; i<num_tables; ++i) {
const auto& keyword = *keywords[i];
VFPProdTable table;
table.init(keyword, unit_system);
//Check that the table in question has a unique ID
int table_id = table.getTableNum();
if (tableMap.find(table_id) == tableMap.end()) {
tableMap.insert(std::make_pair(table_id, std::move(table)));
}
else {
throw std::invalid_argument("Duplicate table numbers for VFPPROD found");
}
}
}
void Schedule::initVFPInjTables(const Deck& deck,
std::map<int, VFPInjTable>& tableMap) {
if (!deck.hasKeyword(ParserKeywords::VFPINJ::keywordName)) {
return;
}
int num_tables = deck.count(ParserKeywords::VFPINJ::keywordName);
const auto& keywords = deck.getKeywordList<ParserKeywords::VFPINJ>();
const auto& unit_system = deck.getActiveUnitSystem();
for (int i=0; i<num_tables; ++i) {
const auto& keyword = *keywords[i];
VFPInjTable table;
table.init(keyword, unit_system);
//Check that the table in question has a unique ID
int table_id = table.getTableNum();
if (tableMap.find(table_id) == tableMap.end()) {
tableMap.insert(std::make_pair(table_id, std::move(table)));
}
else {
throw std::invalid_argument("Duplicate table numbers for VFPINJ found");
}
}
}
std::time_t Schedule::getStartTime() const {
return this->posixStartTime( );
@@ -1684,5 +1739,14 @@ namespace Opm {
for (auto& well : this->m_wells)
well.filterCompletions(grid);
}
const std::map<int, VFPProdTable>& Schedule::getVFPProdTables() const {
return m_vfpprodTables;
}
const std::map<int, VFPInjTable>& Schedule::getVFPInjTables() const {
return m_vfpinjTables;
}
}