diff --git a/ebos/eclgenericvanguard.cc b/ebos/eclgenericvanguard.cc index fd78bd689..8a885ce49 100644 --- a/ebos/eclgenericvanguard.cc +++ b/ebos/eclgenericvanguard.cc @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -99,17 +98,10 @@ void EclGenericVanguard::readDeck(const std::string& filename) std::unique_ptr wtestState; std::shared_ptr summaryConfig; - auto parseContext = - std::make_unique(std::vector> - {{ParseContext::PARSE_RANDOM_SLASH, InputErrorAction::IGNORE}, - {ParseContext::PARSE_MISSING_DIMS_KEYWORD, InputErrorAction::WARN}, - {ParseContext::SUMMARY_UNKNOWN_WELL, InputErrorAction::WARN}, - {ParseContext::SUMMARY_UNKNOWN_GROUP, InputErrorAction::WARN}}); - Opm::readDeck(EclGenericVanguard::comm(), filename, eclipseState, schedule, udqState, actionState, wtestState, - summaryConfig, nullptr, nullptr, std::move(parseContext), + summaryConfig, nullptr, nullptr, false, false, false, {}); EclGenericVanguard::setParams(setupTimer.elapsed(), diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp index 54d999cd9..889773c9d 100644 --- a/opm/simulators/flow/Main.hpp +++ b/opm/simulators/flow/Main.hpp @@ -50,7 +50,6 @@ #include #include -#include #include #include #include @@ -502,7 +501,6 @@ private: EWOMS_GET_PARAM(PreTypeTag, std::string, OutputMode), outputCout_, "STDOUT_LOGGER", allRanksDbgPrtLog); const bool strictParsing = EWOMS_GET_PARAM(PreTypeTag, bool, EclStrictParsing); - auto parseContext = setupParseContext(strictParsing); FlowMainEbos::printPRTHeader(outputCout_); @@ -517,7 +515,7 @@ private: readDeck(EclGenericVanguard::comm(), deckFilename, eclipseState_, schedule_, udqState_, actionState_, wtestState_, - summaryConfig_, nullptr, python, std::move(parseContext), + summaryConfig_, nullptr, python, strictParsing, init_from_restart_file, outputCout_, outputInterval); verifyValidCellGeometry(EclGenericVanguard::comm(), *this->eclipseState_); @@ -718,7 +716,7 @@ private: return flowEbosWaterOnlyMain(argc_, argv_, outputCout_, outputFiles_); } - + int runWaterOnlyEnergy(const Phases& phases) { if (!phases.active(Phase::WATER) || phases.size() != 2) { @@ -742,7 +740,7 @@ private: return EXIT_FAILURE; } - if (phases.size() == 3) { + if (phases.size() == 3) { if (phases.active(Phase::OIL)){ // oil water brine case return flowEbosOilWaterBrineMain(argc_, argv_, outputCout_, outputFiles_); @@ -752,7 +750,7 @@ private: eclipseState_->getSimulationConfig().hasVAPWAT()) { //case with water vaporization into gas phase and salt precipitation return flowEbosGasWaterSaltprecVapwatMain(argc_, argv_, outputCout_, outputFiles_); - } + } else { return flowEbosGasWaterBrineMain(argc_, argv_, outputCout_, outputFiles_); } diff --git a/opm/simulators/utils/readDeck.cpp b/opm/simulators/utils/readDeck.cpp index eaff59e1f..8edc79429 100644 --- a/opm/simulators/utils/readDeck.cpp +++ b/opm/simulators/utils/readDeck.cpp @@ -489,7 +489,7 @@ void Opm::readDeck(Opm::Parallel::Communication comm, std::shared_ptr& summaryConfig, std::unique_ptr errorGuard, std::shared_ptr python, - std::unique_ptr parseContext, + const bool strictParsing, const bool initFromRestart, const bool checkDeck, const std::optional& outputInterval) @@ -503,6 +503,7 @@ void Opm::readDeck(Opm::Parallel::Communication comm, if (comm.rank() == 0) { // Always true when !HAVE_MPI try { + auto parseContext = setupParseContext(strictParsing); readOnIORank(comm, deckFilename, parseContext.get(), eclipseState, schedule, udqState, actionState, wtestState, summaryConfig, std::move(python), initFromRestart, diff --git a/opm/simulators/utils/readDeck.hpp b/opm/simulators/utils/readDeck.hpp index 392c4f0b9..96f21aa5f 100644 --- a/opm/simulators/utils/readDeck.hpp +++ b/opm/simulators/utils/readDeck.hpp @@ -86,7 +86,7 @@ void readDeck(Parallel::Communication comm, std::shared_ptr& summaryConfig, std::unique_ptr errorGuard, std::shared_ptr python, - std::unique_ptr parseContext, + bool strictParsing, bool initFromRestart, bool checkDeck, const std::optional& outputInterval);