Merge pull request #2272 from joakim-hove/remove-udq-constructor

Remove UDQParams( Deck ) constructor

opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp

@@ -39,7 +39,6 @@
 namespace Opm {
 
     class DeckRecord;
-    class Deck;
     class SummaryState;
     class UDQState;
     class KeywordLocation;
@@ -48,7 +47,6 @@ namespace Opm {
     class UDQConfig {
     public:
         UDQConfig() = default;
-        explicit UDQConfig(const Deck& deck);
         explicit UDQConfig(const UDQParams& params);
 
         static UDQConfig serializeObject();

src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp

@@ -113,7 +113,7 @@ namespace {
         m_static( python, deck, runspec ),
         m_sched_deck(deck, restart_info(rst) ),
         m_timeMap( deck , restart_info( rst )),
-        udq_config(this->m_timeMap, std::make_shared<UDQConfig>(deck)),
+        udq_config(this->m_timeMap, std::make_shared<UDQConfig>(runspec.udqParams())),
         guide_rate_config(this->m_timeMap, std::make_shared<GuideRateConfig>()),
         m_glo(this->m_timeMap, std::make_shared<GasLiftOpt>()),
         rft_config(this->m_timeMap),

src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.cpp

@@ -22,7 +22,7 @@
 
 #include <opm/common/OpmLog/KeywordLocation.hpp>
 #include <opm/common/utility/OpmInputError.hpp>
-#include <opm/parser/eclipse/Deck/Deck.hpp>
+#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQEnums.hpp>
@@ -47,11 +47,6 @@ namespace Opm {
     {}
 
 
-    UDQConfig::UDQConfig(const Deck& deck) :
-        udq_params(deck),
-        udqft(this->udq_params)
-    {}
-
     UDQConfig UDQConfig::serializeObject()
     {
         UDQConfig result;