Fixing update failed continued

flowexperimental/comp/wells/CompWellModel.hpp

@@ -96,6 +96,11 @@ class CompWellModel : WellConnectionAuxiliaryModule<TypeTag, CompWellModel<TypeT
     void beginTimeStep();
     void beginIteration();
 
+     // FlowProblem calls these lifecycle hooks for well models.
+     // Compositional wells currently keep no extra timestep snapshot state.
+     void updateFailed() {}
+     void advanceTimeLevel() {}
+
     void init();
     void endIteration() const {}
     void endTimeStep() {}

opm/simulators/flow/BlackoilModel_impl.hpp

@@ -122,10 +122,10 @@ prepareStep(const SimulatorTimerInterface& timer)
                                 "- the previous step succeeded on some ranks but failed on others.");
     }
     if (lastStepFailed) {
-        simulator_.model().updateFailed();
+        simulator_.problem().updateFailed();
     }
     else {
-        simulator_.model().advanceTimeLevel();
+        simulator_.problem().advanceTimeLevel();
     }
 
     // Set the timestep size and episode index for the model explicitly.

opm/simulators/flow/FlowProblem.hpp

@@ -392,6 +392,18 @@ class FlowProblem : public GetPropType<TypeTag, Properties::BaseProblem>
 
     }
 
+    void updateFailed()
+    {
+        wellModel_.updateFailed();
+        this->model().updateFailed();
+    }
+
+    void advanceTimeLevel()
+    {
+        this->model().advanceTimeLevel();
+        wellModel_.advanceTimeLevel();
+    }
+
     /*!
      * \brief Called by the simulator before each Newton-Raphson iteration.
      */

opm/simulators/wells/BlackoilWellModel.hpp

@@ -154,6 +154,10 @@ template<class Scalar> class WellContributions;
 
             void beginTimeStep();
 
+            void updateFailed();
+
+            void advanceTimeLevel();
+
             void beginIteration()
             {
                 OPM_TIMEBLOCK(beginIteration);

opm/simulators/wells/BlackoilWellModelGeneric.cpp

@@ -110,6 +110,7 @@ BlackoilWellModelGeneric(Schedule& schedule,
     , guideRate_(schedule)
     , active_wgstate_(pu)
     , last_valid_wgstate_(pu)
+    , prev_timestep_wgstate_(pu)
     , nupcol_wgstate_(pu)
     , group_state_helper_(this->wellState(),
                           this->groupState(),
@@ -1964,10 +1965,12 @@ operator==(const BlackoilWellModelGeneric& rhs) const
         && this->last_run_wellpi_ == rhs.last_run_wellpi_
         && this->local_shut_wells_ == rhs.local_shut_wells_
         && this->closed_this_step_ == rhs.closed_this_step_
+        && this->prev_timestep_closed_this_step_ == rhs.prev_timestep_closed_this_step_
         && this->genNetwork_ == rhs.genNetwork_
         && this->prev_inj_multipliers_ == rhs.prev_inj_multipliers_
         && this->active_wgstate_ == rhs.active_wgstate_
         && this->last_valid_wgstate_ == rhs.last_valid_wgstate_
+        && this->prev_timestep_wgstate_ == rhs.prev_timestep_wgstate_
         && this->nupcol_wgstate_ == rhs.nupcol_wgstate_
         && this->switched_prod_groups_ == rhs.switched_prod_groups_
         && this->switched_inj_groups_ == rhs.switched_inj_groups_

opm/simulators/wells/BlackoilWellModelGeneric.hpp

@@ -212,6 +212,23 @@ class BlackoilWellModelGeneric
 
     data::GroupAndNetworkValues groupAndNetworkData(const int reportStepIdx) const;
 
+    // Snapshot dynamic state at start of timestep for failure recovery.
+    void advanceTimeLevel()
+    {
+        this->prev_timestep_wgstate_ = this->active_wgstate_;
+        this->prev_timestep_closed_this_step_ = this->closed_this_step_;
+        this->genNetwork_.commitState();
+    }
+
+    // Restore dynamic state captured at the start of the failing timestep.
+    void updateFailed()
+    {
+        this->active_wgstate_ = this->prev_timestep_wgstate_;
+        this->closed_this_step_ = this->prev_timestep_closed_this_step_;
+        this->genNetwork_.resetState();
+        this->group_state_helper_.updateState(this->wellState(), this->groupState());
+    }
+
     /// Shut down any single well
     /// Returns true if the well was actually found and shut.
     bool forceShutWellByName(const std::string& wellname,
@@ -254,11 +271,13 @@ class BlackoilWellModelGeneric
         serializer(last_run_wellpi_);
         serializer(local_shut_wells_);
         serializer(closed_this_step_);
+        serializer(prev_timestep_closed_this_step_);
         serializer(guideRate_);
         serializer(genNetwork_);
         serializer(prev_inj_multipliers_);
         serializer(active_wgstate_);
         serializer(last_valid_wgstate_);
+        serializer(prev_timestep_wgstate_);
         serializer(nupcol_wgstate_);
         serializer(switched_prod_groups_);
         serializer(switched_inj_groups_);
@@ -550,6 +569,7 @@ class BlackoilWellModelGeneric
     std::vector<int> pvt_region_idx_;
 
     mutable std::unordered_set<std::string> closed_this_step_;
+    std::unordered_set<std::string> prev_timestep_closed_this_step_;
 
     GuideRate guideRate_;
     std::unique_ptr<VFPProperties<Scalar, IndexTraits>> vfp_properties_{};
@@ -568,6 +588,7 @@ class BlackoilWellModelGeneric
     */
     WGState<Scalar, IndexTraits> active_wgstate_;
     WGState<Scalar, IndexTraits> last_valid_wgstate_;
+    WGState<Scalar, IndexTraits> prev_timestep_wgstate_;
     WGState<Scalar, IndexTraits> nupcol_wgstate_;
     GroupStateHelperType group_state_helper_;
     WellGroupEvents report_step_start_events_; //!< Well group events at start of report step

opm/simulators/wells/BlackoilWellModel_impl.hpp

@@ -569,6 +569,22 @@ namespace Opm {
 
     }
 
+    template<typename TypeTag>
+    void
+    BlackoilWellModel<TypeTag>::
+    updateFailed()
+    {
+        this->BlackoilWellModelGeneric<Scalar, IndexTraits>::updateFailed();
+    }
+
+    template<typename TypeTag>
+    void
+    BlackoilWellModel<TypeTag>::
+    advanceTimeLevel()
+    {
+        this->BlackoilWellModelGeneric<Scalar, IndexTraits>::advanceTimeLevel();
+    }
+
 #ifdef RESERVOIR_COUPLING_ENABLED
     // Automatically manages the lifecycle of the DeferredLogger pointer
     // in the reservoir coupling logger. Ensures the logger is properly