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

Merge pull request #3583 from blattms/file-trailing-ws-error

Browse Source 
trim trailing and leading whitespace of paths in INCLUDE
This commit is contained in:
Bård Skaflestad
2023-06-28 21:36:33 +02:00
committed by GitHub
parent 17f740dab1 2fa51c6edb
commit b76b22b697
3 changed files with 13 additions and 5 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();

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

@@ -66,6 +66,7 @@
#include <stack>
#include <stdexcept>
#include <string>
#include <regex>
#include <utility>
#include <vector>
@@ -680,7 +681,10 @@ std::optional<std::filesystem::path> ParserState::getIncludeFilePath( std::strin
OpmLog::warning("Replaced one or more backslash with a slash in an INCLUDE path.");
}
std::filesystem::path includeFilePath(path);
// trim leading and trailing whitespace just like the other simulator
std::regex trim_regex("^\\s+|\\s+$");
const auto& trimmed_path = std::regex_replace(path, trim_regex, "");
std::filesystem::path includeFilePath(trimmed_path);
if (includeFilePath.is_relative())
includeFilePath = this->rootPath / includeFilePath;
@@ -688,7 +692,11 @@ std::optional<std::filesystem::path> ParserState::getIncludeFilePath( std::strin
try {
includeFilePath = std::filesystem::canonical(includeFilePath);
} catch (const std::filesystem::filesystem_error& fs_error) {
parseContext.handleError( ParseContext::PARSE_MISSING_INCLUDE , fmt::format("No such file: {}", includeFilePath.string()), {}, errors);
parseContext.handleError( ParseContext::PARSE_MISSING_INCLUDE ,
fmt::format("File '{}' included via INCLUDE"
" directive does not exist.",
trimmed_path),
{}, errors);
return {};
}
@@ -1186,7 +1194,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)