changed: remove support for internal schedule handling in simulators

ebos/eclgenericvanguard.cc

@@ -57,7 +57,7 @@ std::shared_ptr<Deck> EclGenericVanguard::deck_;
 std::unique_ptr<ParseContext> EclGenericVanguard::externalParseContext_;
 std::unique_ptr<ErrorGuard> EclGenericVanguard::externalErrorGuard_;
 std::shared_ptr<EclipseState> EclGenericVanguard::eclState_;
-std::shared_ptr<Schedule> EclGenericVanguard::externalEclSchedule_;
+std::shared_ptr<Schedule> EclGenericVanguard::eclSchedule_;
 std::shared_ptr<SummaryConfig> EclGenericVanguard::externalEclSummaryConfig_;
 std::unique_ptr<UDQState> EclGenericVanguard::externalUDQState_;
 std::unique_ptr<Action::State> EclGenericVanguard::externalActionState_;
@@ -81,14 +81,14 @@ void EclGenericVanguard::setExternalErrorGuard(std::unique_ptr<ErrorGuard> error
     externalErrorGuard_ = std::move(errorGuard);
 }
 
-void EclGenericVanguard::setExternalSchedule(std::shared_ptr<Schedule> schedule)
+void EclGenericVanguard::setSchedule(std::shared_ptr<Schedule> schedule)
 {
-    externalEclSchedule_ = std::move(schedule);
+    eclSchedule_ = std::move(schedule);
 }
 
-void EclGenericVanguard::setExternalSchedule(std::unique_ptr<Schedule> schedule)
+void EclGenericVanguard::setSchedule(std::unique_ptr<Schedule> schedule)
 {
-    externalEclSchedule_ = std::move(schedule);
+    eclSchedule_ = std::move(schedule);
 }
 
 void EclGenericVanguard::setExternalSummaryConfig(
@@ -269,9 +269,8 @@ void EclGenericVanguard::init()
             parseContext_ = std::move(externalParseContext_);
             errorGuard = std::move(externalErrorGuard_);
         }
-        else if(externalEclSchedule_ && externalEclSummaryConfig_)
+        else if(externalEclSummaryConfig_)
         {
-            eclSchedule_ = std::move(externalEclSchedule_);
             eclSummaryConfig_ = std::move(externalEclSummaryConfig_);
         }
         else

ebos/eclgenericvanguard.hh

@@ -133,12 +133,9 @@ public:
 
     /*!
      * \brief Set the schedule object.
-     *
-     * The lifetime of this object is not managed by the vanguard, i.e., the object must
-     * stay valid until after the vanguard gets destroyed.
      */
-    static void setExternalSchedule(std::shared_ptr<Schedule> schedule);
+    static void setSchedule(std::shared_ptr<Schedule> schedule);
-    static void setExternalSchedule(std::unique_ptr<Schedule> schedule);
+    static void setSchedule(std::unique_ptr<Schedule> schedule);
 
     /*!
      * \brief Set the summary configuration object.
@@ -315,7 +312,6 @@ protected:
     static std::unique_ptr<ErrorGuard> externalErrorGuard_;
 
     // These variables may be owned by both Python and the simulator
-    static std::shared_ptr<Schedule> externalEclSchedule_;
     static std::shared_ptr<SummaryConfig> externalEclSummaryConfig_;
 
     static std::unique_ptr<UDQState> externalUDQState_;
@@ -359,7 +355,7 @@ protected:
     // These variables may be owned by both Python and the simulator
     static std::shared_ptr<Deck> deck_;
     static std::shared_ptr<EclipseState> eclState_;
-    std::shared_ptr<Schedule> eclSchedule_;
+    static std::shared_ptr<Schedule> eclSchedule_;
     std::shared_ptr<SummaryConfig> eclSummaryConfig_;
 
     /*! \brief Information about wells in parallel

flow/flow_ebos_blackoil.cpp

@@ -38,7 +38,7 @@ void flowEbosBlackoilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalUDQState(std::move(udqState));
     Vanguard::setExternalActionState(std::move(actionState));
     Vanguard::setExternalWTestState(std::move(wtestState));

flow/flow_ebos_brine.cpp

@@ -48,7 +48,7 @@ void flowEbosBrineSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_brine_precsalt_vapwat.cpp

@@ -58,7 +58,7 @@ void flowEbosBrinePrecsaltVapwatSetDeck(double setupTime, std::shared_ptr<Deck>
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_brine_saltprecipitation.cpp

@@ -53,7 +53,7 @@ void flowEbosBrineSaltPrecipitationSetDeck(double setupTime, std::shared_ptr<Dec
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_energy.cpp

@@ -48,7 +48,7 @@ void flowEbosEnergySetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_extbo.cpp

@@ -48,7 +48,7 @@ void flowEbosExtboSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_foam.cpp

@@ -48,7 +48,7 @@ void flowEbosFoamSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_gasoil.cpp

@@ -69,7 +69,7 @@ void flowEbosGasOilSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_gasoil_energy.cpp

@@ -73,7 +73,7 @@ void flowEbosGasOilEnergySetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_gaswater.cpp

@@ -72,7 +72,7 @@ void flowEbosGasWaterSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_gaswater_brine.cpp

@@ -72,7 +72,7 @@ void flowEbosGasWaterBrineSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_gaswater_saltprec_vapwat.cpp

@@ -83,7 +83,7 @@ void flowEbosGasWaterSaltprecVapwatSetDeck(double setupTime, std::shared_ptr<Dec
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_micp.cpp

@@ -72,7 +72,7 @@ void flowEbosMICPSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_oilwater.cpp

@@ -69,7 +69,7 @@ void flowEbosOilWaterSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_oilwater_brine.cpp

@@ -72,7 +72,7 @@ void flowEbosOilWaterBrineSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_oilwater_polymer.cpp

@@ -72,7 +72,7 @@ void flowEbosOilWaterPolymerSetDeck(double setupTime, std::shared_ptr<Deck> deck
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_onephase.cpp

@@ -68,7 +68,7 @@ void flowEbosWaterOnlySetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_onephase_energy.cpp

@@ -75,7 +75,7 @@ void flowEbosWaterOnlyEnergySetDeck(double setupTime, std::shared_ptr<Deck> deck
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_polymer.cpp

@@ -48,7 +48,7 @@ void flowEbosPolymerSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

flow/flow_ebos_solvent.cpp

@@ -48,7 +48,7 @@ void flowEbosSolventSetDeck(double setupTime, std::shared_ptr<Deck> deck,
     Vanguard::setSetupTime(setupTime);
     Vanguard::setDeck(std::move(deck));
     Vanguard::setEclState(std::move(eclState));
-    Vanguard::setExternalSchedule(std::move(schedule));
+    Vanguard::setSchedule(std::move(schedule));
     Vanguard::setExternalSummaryConfig(std::move(summaryConfig));
 }
 

opm/simulators/flow/Main.hpp

@@ -106,7 +106,7 @@ void flowEbosSetDeck(std::shared_ptr<Deck> deck,
 
     Vanguard::setDeck(deck);
     Vanguard::setEclState(eclState);
-    Vanguard::setExternalSchedule(schedule);
+    Vanguard::setSchedule(schedule);
     Vanguard::setExternalSummaryConfig(summaryConfig);
 }