Merge pull request #3427 from joakim-hove/rst-load-udq

Rst load udq

flow/flow_ebos_blackoil.cpp

@@ -33,6 +33,7 @@ namespace Opm {
 void flowEbosBlackoilSetDeck(double setupTime, std::unique_ptr<Deck> deck,
                              std::unique_ptr<EclipseState> eclState,
                              std::unique_ptr<Schedule> schedule,
+                             std::unique_ptr<UDQState> udqState,
                              std::unique_ptr<SummaryConfig> summaryConfig)
 {
     using TypeTag = Properties::TTag::EclFlowProblem;
@@ -42,6 +43,7 @@ void flowEbosBlackoilSetDeck(double setupTime, std::unique_ptr<Deck> deck,
     Vanguard::setExternalDeck(std::move(deck));
     Vanguard::setExternalEclState(std::move(eclState));
     Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setExternalUDQState(std::move(udqState));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_blackoil.hpp

@@ -26,11 +26,13 @@ class EclipseState;
 template<class TypeTag> class FlowMainEbos;
 class Schedule;
 class SummaryConfig;
+class UDQState;
 namespace Properties { namespace TTag { struct EclFlowProblem; } }
 
 void flowEbosBlackoilSetDeck(double setupTime, std::unique_ptr<Deck> deck,
                              std::unique_ptr<EclipseState> eclState,
                              std::unique_ptr<Schedule> schedule,
+                             std::unique_ptr<UDQState> udqState,
                              std::unique_ptr<SummaryConfig> summaryConfig);
 
 int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles);

opm/simulators/flow/FlowMainEbos.hpp

@@ -33,6 +33,7 @@
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 #include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQState.hpp>
 #include <opm/common/utility/String.hpp>
 
 #include <fmt/format.h>

opm/simulators/flow/Main.hpp

@@ -188,6 +188,7 @@ namespace Opm
                     std::move(deck_),
                     std::move(eclipseState_),
                     std::move(schedule_),
+                    std::move(udqState_),
                     std::move(summaryConfig_));
                 return flowEbosBlackoilMainInit(
                     argc_, argv_, outputCout_, outputFiles_);
@@ -326,6 +327,7 @@ namespace Opm
                 flowEbosBlackoilSetDeck(setupTime_, std::move(deck_),
                                         std::move(eclipseState_),
                                         std::move(schedule_),
+                                        std::move(udqState_),
                                         std::move(summaryConfig_));
                 return flowEbosBlackoilMain(argc_, argv_, outputCout_, outputFiles_);
             }

opm/simulators/utils/readDeck.cpp

@@ -245,6 +245,7 @@ void readDeck(int rank, std::string& deckFilename, std::unique_ptr<Opm::Deck>& d
                 if (!schedule)
                     schedule = std::make_unique<Opm::Schedule>(*deck, *eclipseState, *parseContext, *errorGuard, python, outputInterval, &rst_state);
                 udqState = std::make_unique<Opm::UDQState>( schedule->operator[](0).udq().params().undefinedValue() );
+                udqState->load_rst(rst_state);
             }
             else {
                 if (!schedule)