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

also eat keywords containing lowercase letters

Browse Source 
The Norne deck actually exhibits this atrocity in form of the
'fluxnum' keyword in the file 'INCLUDE/PETRO/FLUXNUM_0704.prop'.

I don't know if Eclipse cares about the case of the keywords, but
opm-parser currently does for sure. (If Eclipse turns out to be
case-insensitive, the easiest fix for us is to just make all keywords
ALL_UPPERCASE...)
This commit is contained in:
Andreas Lauser
2014-09-01 21:00:51 +02:00
committed by Joakim Hove
parent 7955ea5dac
commit 382d449ebb
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,9 +160,8 @@ namespace Opm {
}
bool Parser::isRecognizedKeyword(const std::string& deckKeywordName) const {
if (!ParserKeyword::validDeckName(deckKeywordName)) {
if (!ParserKeyword::validDeckName(deckKeywordName, /*acceptLowerCase=*/true))
return false;
}
if (m_deckParserKeywords.count(deckKeywordName) > 0)
return true;
@@ -310,8 +309,8 @@ namespace Opm {
"The keyword " + parserState->rawKeyword->getKeywordName() + " is ignored - this might potentially affect the results");
} else {
DeckKeywordPtr deckKeyword(new DeckKeyword(parserState->rawKeyword->getKeywordName(), false));
deckKeyword->setLocation(parserState->rawKeyword->getFilename(),
parserState->rawKeyword->getLineNR());
deckKeyword->setLocation(parserState->rawKeyword->getFilename(),
parserState->rawKeyword->getLineNR());
parserState->deck->addKeyword(deckKeyword);
parserState->parserLog.addWarning(parserState->dataFile.string(),
parserState->rawKeyword->getLineNR(),