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

Changed unknown keyword concept to be a constructor only setting

Browse Source
This commit is contained in:
Kristian Flikka
2013-08-22 15:53:57 +02:00
parent c218b803bc
commit 3deab9cdf8
5 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/parser/eclipse/Parser/Parser.cpp
View File

@@ -63,15 +63,13 @@ namespace Opm {
parseFile(deck, pathToIncludedFile.string(), parseStrict);
} else {
if (m_parserKeywords.find(rawKeyword->getKeywordName()) == m_parserKeywords.end()) {
DeckKeywordPtr deckKeyword(new DeckKeyword(rawKeyword->getKeywordName()));
deckKeyword->setUnknown();
deck->addKeyword(deckKeyword);
} else {
if (hasKeyword(rawKeyword->getKeywordName())) {
ParserKeywordConstPtr parserKeyword = m_parserKeywords[rawKeyword->getKeywordName()];
DeckKeywordConstPtr deckKeyword = parserKeyword->parse(rawKeyword);
deck->addKeyword(deckKeyword);
} else {
DeckKeywordPtr deckKeyword(new DeckKeyword(rawKeyword->getKeywordName(), false));
deck->addKeyword(deckKeyword);
}
}
rawKeyword.reset();