Adapt to mixControl moving from genericProblem

opm/simulators/flow/FlowGenericProblem.hpp

@@ -308,8 +308,7 @@ protected:
     bool shouldWriteRestartFile() const
     { return false; }
 
-    bool beginEpisode_(std::size_t numDof,
-                       bool enableExperiments,
+    bool beginEpisode_(bool enableExperiments,
                        int episodeIdx);
     void beginTimeStep_(bool enableExperiments,
                         int episodeIdx,

opm/simulators/flow/FlowGenericProblem_impl.hpp

@@ -418,8 +418,7 @@ vapparsActive(int episodeIdx) const
 
 template<class GridView, class FluidSystem>
 bool FlowGenericProblem<GridView,FluidSystem>::
-beginEpisode_(std::size_t numDof,
-              bool enableExperiments,
+beginEpisode_(bool enableExperiments,
               int episodeIdx)
 {
     if (enableExperiments && gridView_.comm().rank() == 0 && episodeIdx >= 0) {
@@ -439,10 +438,6 @@ beginEpisode_(std::size_t numDof,
         OpmLog::info(ss.str());
     }
 
-    this->mixControls_.init(numDof,
-                        episodeIdx,
-                        eclState_.runspec().tabdims().getNumPVTTables());
-
     const auto& events = schedule_[episodeIdx].events();
 
     // react to TUNING changes

opm/simulators/flow/FlowProblem.hpp

@@ -545,7 +545,11 @@ public:
             this->model().linearizer().updateDiscretizationParameters();
         }
 
-        bool tuningEvent = this->beginEpisode_(this->model().numGridDof(), enableExperiments, this->episodeIndex());
+        bool tuningEvent = this->beginEpisode_(enableExperiments, this->episodeIndex());
+        this->mixControls_.init(this->model().numGridDof(),
+                                episodeIdx,
+                                eclState.runspec().tabdims().getNumPVTTables());
+
 
         // set up the wells for the next episode.
         wellModel_.beginEpisode();