readDeck: make the ParseContext an internal detail

opm/simulators/flow/Main.hpp

@@ -502,7 +502,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<PreTypeTag>::printPRTHeader(outputCout_);
 
@@ -517,7 +516,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 +717,7 @@ private:
 
         return flowEbosWaterOnlyMain(argc_, argv_, outputCout_, outputFiles_);
     }
-    
+
     int runWaterOnlyEnergy(const Phases& phases)
     {
         if (!phases.active(Phase::WATER) || phases.size() != 2) {
@@ -742,7 +741,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 +751,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_);
                 }

opm/simulators/utils/readDeck.cpp

@@ -489,7 +489,7 @@ void Opm::readDeck(Opm::Parallel::Communication    comm,
                    std::shared_ptr<SummaryConfig>& summaryConfig,
                    std::unique_ptr<ErrorGuard>     errorGuard,
                    std::shared_ptr<Python>         python,
-                   std::unique_ptr<ParseContext>   parseContext,
+                   const bool                      strictParsing,
                    const bool                      initFromRestart,
                    const bool                      checkDeck,
                    const std::optional<int>&       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,

opm/simulators/utils/readDeck.hpp

@@ -86,7 +86,7 @@ void readDeck(Parallel::Communication         comm,
               std::shared_ptr<SummaryConfig>& summaryConfig,
               std::unique_ptr<ErrorGuard>     errorGuard,
               std::shared_ptr<Python>         python,
-              std::unique_ptr<ParseContext>   parseContext,
+              bool                            strictParsing,
               bool                            initFromRestart,
               bool                            checkDeck,
               const std::optional<int>&       outputInterval);