Merge pull request #4492 from akva2/restart_serialize_initial_fip

Restart serialization: Store initial fip values

ebos/eclgenericoutputblackoilmodule.hh

@@ -252,6 +252,12 @@ public:
     // Virtual destructor for safer inheritance.
     virtual ~EclGenericOutputBlackoilModule();
 
+    template<class Serializer>
+    void serializeOp(Serializer& serializer)
+    {
+        serializer(initialInplace_);
+    }
+
 protected:
     using ScalarBuffer = std::vector<Scalar>;
     using StringBuffer = std::vector<std::string>;

ebos/eclproblem.hh

@@ -2060,6 +2060,7 @@ public:
         serializer(aquiferModel_);
         serializer(tracerModel_);
         serializer(*materialLawManager_);
+        serializer(*eclWriter_);
     }
 
 private:

ebos/eclwriter.hh

@@ -475,6 +475,12 @@ public:
     Scalar restartTimeStepSize() const
     { return restartTimeStepSize_; }
 
+    template<class Serializer>
+    void serializeOp(Serializer& serializer)
+    {
+        serializer(*eclOutputModule_);
+    }
+
 private:
     static bool enableEclOutput_()
     { return EWOMS_GET_PARAM(TypeTag, bool, EnableEclOutput); }

tests/test_RestartSerialization.cpp

@@ -30,6 +30,8 @@
 #include <opm/input/eclipse/Schedule/SummaryState.hpp>
 #include <opm/input/eclipse/Schedule/UDQ/UDQState.hpp>
 
+#include <opm/output/eclipse/Inplace.hpp>
+
 #include <opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLawParams.hpp>
 
 #include <opm/models/blackoil/blackoilprimaryvariables.hh>
@@ -86,6 +88,7 @@ BOOST_AUTO_TEST_CASE(NAME) \
 TEST_FOR_TYPE(ALQState)
 TEST_FOR_TYPE(GroupState)
 TEST_FOR_TYPE(HardcodedTimeStepControl)
+TEST_FOR_TYPE(Inplace)
 TEST_FOR_TYPE(PerfData)
 TEST_FOR_TYPE(PIDAndIterationCountTimeStepControl)
 TEST_FOR_TYPE(PIDTimeStepControl)