OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 02:30:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

adjust to InputErrorAction change to enum class

Browse Source
This commit is contained in:
Arne Morten Kvarving 2023-01-11 13:18:39 +01:00
parent 4dc068c87f
commit 3a01e89585
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ebos/eclgenericvanguard.cc
View File

@ -99,11 +99,11 @@ void EclGenericVanguard::readDeck(const std::string& filename)
std::shared_ptr<Opm::SummaryConfig> summaryConfig; std::shared_ptr<Opm::SummaryConfig> summaryConfig;
auto parseContext = auto parseContext =
std::make_unique<ParseContext>(std::vector<std::pair<std::string , InputError::Action>> std::make_unique<ParseContext>(std::vector<std::pair<std::string , InputErrorAction>>
{{ParseContext::PARSE_RANDOM_SLASH, InputError::IGNORE}, {{ParseContext::PARSE_RANDOM_SLASH, InputErrorAction::IGNORE},
{ParseContext::PARSE_MISSING_DIMS_KEYWORD, InputError::WARN}, {ParseContext::PARSE_MISSING_DIMS_KEYWORD, InputErrorAction::WARN},
{ParseContext::SUMMARY_UNKNOWN_WELL, InputError::WARN}, {ParseContext::SUMMARY_UNKNOWN_WELL, InputErrorAction::WARN},
{ParseContext::SUMMARY_UNKNOWN_GROUP, InputError::WARN}}); {ParseContext::SUMMARY_UNKNOWN_GROUP, InputErrorAction::WARN}});
Opm::readDeck(EclGenericVanguard::comm(), Opm::readDeck(EclGenericVanguard::comm(),
filename, eclipseState, schedule, udqState, filename, eclipseState, schedule, udqState,

12
opm/simulators/flow/Main.hpp
View File

@ -504,13 +504,13 @@ private:
EWOMS_GET_PARAM(PreTypeTag, std::string, OutputMode), EWOMS_GET_PARAM(PreTypeTag, std::string, OutputMode),
outputCout_, "STDOUT_LOGGER", allRanksDbgPrtLog); outputCout_, "STDOUT_LOGGER", allRanksDbgPrtLog);
auto parseContext = auto parseContext =
std::make_unique<ParseContext>(std::vector<std::pair<std::string , InputError::Action>> std::make_unique<ParseContext>(std::vector<std::pair<std::string , InputErrorAction>>
{{ParseContext::PARSE_RANDOM_SLASH, InputError::IGNORE}, {{ParseContext::PARSE_RANDOM_SLASH, InputErrorAction::IGNORE},
{ParseContext::PARSE_MISSING_DIMS_KEYWORD, InputError::WARN}, {ParseContext::PARSE_MISSING_DIMS_KEYWORD, InputErrorAction::WARN},
{ParseContext::SUMMARY_UNKNOWN_WELL, InputError::WARN}, {ParseContext::SUMMARY_UNKNOWN_WELL, InputErrorAction::WARN},
{ParseContext::SUMMARY_UNKNOWN_GROUP, InputError::WARN}}); {ParseContext::SUMMARY_UNKNOWN_GROUP, InputErrorAction::WARN}});
if (EWOMS_GET_PARAM(PreTypeTag, bool, EclStrictParsing)) if (EWOMS_GET_PARAM(PreTypeTag, bool, EclStrictParsing))
parseContext->update(InputError::DELAYED_EXIT1); parseContext->update(InputErrorAction::DELAYED_EXIT1);
FlowMainEbos<PreTypeTag>::printPRTHeader(outputCout_); FlowMainEbos<PreTypeTag>::printPRTHeader(outputCout_);

2
tests/test_norne_pvt.cpp
View File

@ -280,7 +280,7 @@ void verify_norne_oil_pvt_region2(const Opm::EclipseState& eclState, const Opm::
} }
BOOST_AUTO_TEST_CASE( Test_Norne_PVT) { BOOST_AUTO_TEST_CASE( Test_Norne_PVT) {
Opm::ParseContext parseContext({{ ParseContext::PARSE_RANDOM_SLASH , InputError::IGNORE }}); Opm::ParseContext parseContext({{ ParseContext::PARSE_RANDOM_SLASH , InputErrorAction::IGNORE }});
Opm::ErrorGuard errorGuard; Opm::ErrorGuard errorGuard;
Opm::Parser parser; Opm::Parser parser;
auto python = std::make_shared<Opm::Python>(); auto python = std::make_shared<Opm::Python>();