fixed: pass the fipnum data into the adaptive timer stepper

summary substep reports requires FIP data

opm/autodiff/BlackoilModelEbos.hpp

@@ -1005,6 +1005,14 @@ namespace Opm {
             return fluid_.numPhases();
         }
 
+        /// Wrapper required due to not following generic API
+        template<class T>
+        std::vector<std::vector<double> >
+        computeFluidInPlace(const T&, const std::vector<int>& fipnum) const
+        {
+            return computeFluidInPlace(fipnum);
+        }
+
         std::vector<std::vector<double> >
         computeFluidInPlace(const std::vector<int>& fipnum) const
         {

opm/autodiff/SimulatorBase_impl.hpp

@@ -232,7 +232,8 @@ namespace Opm
             // \Note: The report steps are met in any case
             // \Note: The sub stepping will require a copy of the state variables
             if( adaptiveTimeStepping ) {
-                report += adaptiveTimeStepping->step( timer, *solver, state, well_state, output_writer_ );
+                report += adaptiveTimeStepping->step( timer, *solver, state, well_state, output_writer_, 
+                                                     output_writer_.requireFIPNUM() ? &fipnum : nullptr );
             }
             else {
                 // solve for complete report step

opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp

@@ -282,7 +282,8 @@ public:
             // \Note: The report steps are met in any case
             // \Note: The sub stepping will require a copy of the state variables
             if( adaptiveTimeStepping ) {
-                report += adaptiveTimeStepping->step( timer, *solver, state, well_state, output_writer_ );
+                report += adaptiveTimeStepping->step( timer, *solver, state, well_state, output_writer_,
+                                                      output_writer_.requireFIPNUM() ? &fipnum : nullptr );
             }
             else {
                 // solve for complete report step

opm/autodiff/SimulatorFullyImplicitBlackoilOutput.cpp

@@ -459,4 +459,9 @@ namespace Opm
         const auto& initconfig = eclipseState_.getInitConfig();
         return initconfig.restartRequested();
     }
+
+
+    bool BlackoilOutputWriter::requireFIPNUM() const {
+        return eclipseState_.getSummaryConfig().requireFIPNUM();
+    }
 }

opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp

@@ -288,6 +288,8 @@ namespace Opm
 
         bool isRestart() const;
 
+        bool requireFIPNUM() const;
+
     protected:
         const bool output_;
         std::unique_ptr< ParallelDebugOutputInterface > parallelOutput_;

opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.cpp

@@ -299,4 +299,9 @@ namespace Opm
         const auto& initconfig = eclipseState_.getInitConfig();
         return initconfig.restartRequested();
     }
+
+
+    bool BlackoilOutputWriterEbos::requireFIPNUM() const {
+        return eclipseState_.getSummaryConfig().requireFIPNUM();
+    }
 }

opm/autodiff/SimulatorFullyImplicitBlackoilOutputEbos.hpp

@@ -147,6 +147,8 @@ namespace Opm
 
         bool isRestart() const;
 
+        bool requireFIPNUM() const;
+
     protected:
         const bool output_;
         std::unique_ptr< ParallelDebugOutputInterface > parallelOutput_;