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

Added dimensions to WCONHIST & WCONPROD.

Browse Source
This commit is contained in:
Joakim Hove
2013-12-16 00:02:47 +01:00
parent 800c4ff32e
commit 65c9882b53
8 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,9 +52,7 @@ namespace Opm {
}
DeckPtr Parser::parse(const std::string &dataFile) const {
DeckPtr deck = parse(dataFile, true);
applyUnitsToDeck(deck);
return deck;
return parse(dataFile, true);
}
@@ -71,6 +69,7 @@ namespace Opm {
std::shared_ptr<ParserState> parserState(new ParserState(dataFileName, DeckPtr(new Deck()), getRootPathFromFile(dataFileName), strictParsing));
parseFile(parserState);
applyUnitsToDeck(parserState->deck);
return parserState->deck;
}
@@ -346,9 +345,12 @@ namespace Opm {
deck->initUnitSystem();
for (size_t index=0; index < deck->size(); ++index) {
DeckKeywordPtr deckKeyword = deck->getKeyword( index );
ParserKeywordConstPtr parserKeyword = getKeyword( deckKeyword->name() );
if (parserKeyword->hasDimension())
parserKeyword->applyUnitsToDeck(deck , deckKeyword);
if (canParseKeyword( deckKeyword->name())) {
ParserKeywordConstPtr parserKeyword = getKeyword( deckKeyword->name() );
if (parserKeyword->hasDimension()) {
parserKeyword->applyUnitsToDeck(deck , deckKeyword);
}
}
}
}