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

Also cater for trailing/leading ws for GDFILE/IMPORT keywords.

Browse Source 
By trimming the strings.
This commit is contained in:
Markus Blatt
2023-06-28 16:48:55 +02:00
parent 4129543457
commit 2fa51c6edb
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@@ -564,7 +564,7 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
void EclipseGrid::initBinaryGrid(const Deck& deck) {
const DeckKeyword& gdfile_kw = deck["GDFILE"].back();
const std::string& gdfile_arg = gdfile_kw.getRecord(0).getItem("filename").get<std::string>(0);
const std::string& gdfile_arg = gdfile_kw.getRecord(0).getItem("filename").getTrimmedString(0);
std::string filename = deck.makeDeckPath(gdfile_arg);
std::unique_ptr<Opm::EclIO::EclFile> egridfile;

2
src/opm/input/eclipse/EclipseState/Grid/GridDims.cpp
View File

@@ -159,7 +159,7 @@ namespace Opm {
void GridDims::binary_init(const Deck& deck)
{
const DeckKeyword& gdfile_kw = deck["GDFILE"].back();
const std::string& gdfile_arg = gdfile_kw.getRecord(0).getItem("filename").get<std::string>(0);
const std::string& gdfile_arg = gdfile_kw.getRecord(0).getItem("filename").getTrimmedString(0);
const EclIO::EGrid egrid( deck.makeDeckPath(gdfile_arg) );
const auto& dimens = egrid.dimension();

2
src/opm/input/eclipse/Parser/Parser.cpp
View File

@@ -1184,7 +1184,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';
const auto& import_file = parserState.getIncludeFilePath(deck_keyword.getRecord(0).getItem(0).get<std::string>(0));
const auto& import_file = parserState.getIncludeFilePath(deck_keyword.getRecord(0).getItem(0).getTrimmedString(0));
ImportContainer import(parser, parserState.deck.getActiveUnitSystem(), import_file.value().string(), formatted, parserState.deck.size());
for (auto kw : import)