From f4f8c033d8b0d60aa2753acaa2a254a3e198eb28 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Wed, 23 Nov 2022 13:05:50 +0100
Subject: [PATCH] EclGenericVanguard: remove deck member

---
 ebos/eclgenericvanguard.cc   |  6 +-----
 ebos/eclgenericvanguard.hh   | 11 -----------
 opm/simulators/flow/Main.hpp |  3 ---
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/ebos/eclgenericvanguard.cc b/ebos/eclgenericvanguard.cc
index 405be959f..8d95c027e 100644
--- a/ebos/eclgenericvanguard.cc
+++ b/ebos/eclgenericvanguard.cc
@@ -26,7 +26,6 @@
 
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/utility/TimeService.hpp>
-#include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/EclipseState/Aquifer/NumericalAquifer/NumericalAquiferCell.hpp>
 #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/input/eclipse/Parser/ErrorGuard.hpp>
@@ -55,7 +54,6 @@
 namespace Opm {
 
 double EclGenericVanguard::setupTime_ = 0.0;
-std::shared_ptr<Deck> EclGenericVanguard::deck_;
 std::shared_ptr<EclipseState> EclGenericVanguard::eclState_;
 std::shared_ptr<Schedule> EclGenericVanguard::eclSchedule_;
 std::shared_ptr<SummaryConfig> EclGenericVanguard::eclSummaryConfig_;
@@ -72,7 +70,6 @@ EclGenericVanguard::EclGenericVanguard()
 EclGenericVanguard::~EclGenericVanguard() = default;
 
 void EclGenericVanguard::setParams(double setupTime,
-                                   std::shared_ptr<Deck> deck,
                                    std::shared_ptr<EclipseState> eclState,
                                    std::shared_ptr<Schedule> schedule,
                                    std::unique_ptr<UDQState> udqState,
@@ -81,7 +78,6 @@ void EclGenericVanguard::setParams(double setupTime,
                                    std::shared_ptr<SummaryConfig> summaryConfig)
 {
     EclGenericVanguard::setupTime_ = setupTime;
-    EclGenericVanguard::deck_ = std::move(deck);
     EclGenericVanguard::eclState_ = std::move(eclState);
     EclGenericVanguard::eclSchedule_ = std::move(schedule);
     EclGenericVanguard::udqState_ = std::move(udqState);
@@ -117,7 +113,7 @@ void EclGenericVanguard::readDeck(const std::string& filename)
                   false, false, {});
 
     EclGenericVanguard::setParams(setupTimer.elapsed(),
-                                  deck, eclipseState, schedule,
+                                  eclipseState, schedule,
                                   std::move(udqState),
                                   std::move(actionState),
                                   std::move(wtestState), summaryConfig);
diff --git a/ebos/eclgenericvanguard.hh b/ebos/eclgenericvanguard.hh
index 31231e93f..752073b9f 100644
--- a/ebos/eclgenericvanguard.hh
+++ b/ebos/eclgenericvanguard.hh
@@ -103,7 +103,6 @@ public:
      * \brief Set the simulation configuration objects.
      */
     static void setParams(double setupTime,
-                          std::shared_ptr<Deck> deck,
                           std::shared_ptr<EclipseState> eclState,
                           std::shared_ptr<Schedule> schedule,
                           std::unique_ptr<UDQState> udqState,
@@ -111,15 +110,6 @@ public:
                           std::unique_ptr<WellTestState> wtestState,
                           std::shared_ptr<SummaryConfig> summaryConfig);
 
-    /*!
-     * \brief Return a reference to the parsed ECL deck.
-     */
-    const Deck& deck() const
-    { return *deck_; }
-
-    Deck& deck()
-    { return *deck_; }
-
     /*!
      * \brief Return a reference to the internalized ECL deck.
      */
@@ -309,7 +299,6 @@ protected:
     // parser objects.
     std::shared_ptr<Python> python;
     // These variables may be owned by both Python and the simulator
-    static std::shared_ptr<Deck> deck_;
     static std::shared_ptr<EclipseState> eclState_;
     static std::shared_ptr<Schedule> eclSchedule_;
     static std::shared_ptr<SummaryConfig> eclSummaryConfig_;
diff --git a/opm/simulators/flow/Main.hpp b/opm/simulators/flow/Main.hpp
index 11a9f8f4e..c5e9030e0 100644
--- a/opm/simulators/flow/Main.hpp
+++ b/opm/simulators/flow/Main.hpp
@@ -268,7 +268,6 @@ public:
             // case. E.g. check that number of phases == 3
             EclGenericVanguard::setParams(
                 setupTime_,
-                deck_,
                 eclipseState_,
                 schedule_,
                 std::move(udqState_),
@@ -290,7 +289,6 @@ private:
         const auto& phases = rspec.phases();
 
         EclGenericVanguard::setParams(this->setupTime_,
-                                      this->deck_,
                                       this->eclipseState_,
                                       this->schedule_,
                                       std::move(this->udqState_),
@@ -374,7 +372,6 @@ private:
     int dispatchStatic_()
     {
         EclGenericVanguard::setParams(this->setupTime_,
-                                      this->deck_,
                                       this->eclipseState_,
                                       this->schedule_,
                                       std::move(this->udqState_),