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

Support PATHS in IMPORT keyword

Browse Source
This commit is contained in:
Asgeir Nyvoll 2021-08-11 14:32:23 +02:00
parent f373afd526
commit 1a2f6cae46
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/opm/parser/eclipse/Parser/Parser.cpp
View File

@ -1042,10 +1042,7 @@ bool parseState( ParserState& parserState, const Parser& parser ) {
if (deck_keyword.name() == ParserKeywords::IMPORT::keywordName) {
bool formatted = deck_keyword.getRecord(0).getItem(1).get<std::string>(0)[0] == 'F';
auto import_file = Opm::filesystem::path(deck_keyword.getRecord(0).getItem(0).get<std::string>(0));
if (import_file.is_relative())
import_file = parserState.rootPath / import_file;
Opm::filesystem::path import_file = parserState.getIncludeFilePath(deck_keyword.getRecord(0).getItem(0).get<std::string>(0));
ImportContainer import(parser, parserState.deck.getActiveUnitSystem(), import_file.string(), formatted, parserState.deck.size());
for (auto kw : import)

6
tests/parser/ImportTests.cpp
View File

@ -81,6 +81,10 @@ BOOST_AUTO_TEST_CASE(ImportDeck) {
const std::string deck_string = R"(
RUNSPEC
PATHS
'IMPPATH' 'import' /
/
DIMENS
10 10 10 /
@ -90,7 +94,7 @@ IMPORT
'import/GRID' /
IMPORT
'import/PROPS' /
'$IMPPATH/PROPS' /
)";
WorkArea work;