From ac6e0d3e7e0144ab63a0a2029a67407cdfe376d0 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 27 Feb 2023 13:44:37 +0100 Subject: [PATCH 1/2] add restart serialization test for Inplace --- tests/test_RestartSerialization.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_RestartSerialization.cpp b/tests/test_RestartSerialization.cpp index 32193e0b8..3b485301a 100644 --- a/tests/test_RestartSerialization.cpp +++ b/tests/test_RestartSerialization.cpp @@ -30,6 +30,8 @@ #include #include +#include + #include #include @@ -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) From a237b2222fbd935a3a2cdb8d8ec6fcf544b51964 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 27 Feb 2023 13:56:35 +0100 Subject: [PATCH 2/2] fixed: serialize the initial fip values --- ebos/eclgenericoutputblackoilmodule.hh | 6 ++++++ ebos/eclproblem.hh | 1 + ebos/eclwriter.hh | 6 ++++++ 3 files changed, 13 insertions(+) diff --git a/ebos/eclgenericoutputblackoilmodule.hh b/ebos/eclgenericoutputblackoilmodule.hh index cbb9020fc..6005b570c 100644 --- a/ebos/eclgenericoutputblackoilmodule.hh +++ b/ebos/eclgenericoutputblackoilmodule.hh @@ -252,6 +252,12 @@ public: // Virtual destructor for safer inheritance. virtual ~EclGenericOutputBlackoilModule(); + template + void serializeOp(Serializer& serializer) + { + serializer(initialInplace_); + } + protected: using ScalarBuffer = std::vector; using StringBuffer = std::vector; diff --git a/ebos/eclproblem.hh b/ebos/eclproblem.hh index 4f124a64c..5277a8ce4 100644 --- a/ebos/eclproblem.hh +++ b/ebos/eclproblem.hh @@ -2060,6 +2060,7 @@ public: serializer(aquiferModel_); serializer(tracerModel_); serializer(*materialLawManager_); + serializer(*eclWriter_); } private: diff --git a/ebos/eclwriter.hh b/ebos/eclwriter.hh index 2ea89bcd9..021503219 100644 --- a/ebos/eclwriter.hh +++ b/ebos/eclwriter.hh @@ -475,6 +475,12 @@ public: Scalar restartTimeStepSize() const { return restartTimeStepSize_; } + template + void serializeOp(Serializer& serializer) + { + serializer(*eclOutputModule_); + } + private: static bool enableEclOutput_() { return EWOMS_GET_PARAM(TypeTag, bool, EnableEclOutput); }