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

Revert "also eat keywords containing lowercase letters"

Browse Source 
this was inadvertedly merged. the real fix is to make the parser
case-insensitive...
This commit is contained in:
Andreas Lauser
2014-11-07 14:23:08 +01:00
parent 382d449ebb
commit fff0c9cdf0
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,8 +160,9 @@ namespace Opm {
}
bool Parser::isRecognizedKeyword(const std::string& deckKeywordName) const {
if (!ParserKeyword::validDeckName(deckKeywordName, /*acceptLowerCase=*/true))
if (!ParserKeyword::validDeckName(deckKeywordName)) {
return false;
}
if (m_deckParserKeywords.count(deckKeywordName) > 0)
return true;
@@ -309,8 +310,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(),