From 1b7ef65509e1fb58b98d76c09597b02d57fcfca8 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Fri, 24 Sep 2021 14:48:38 +0200 Subject: [PATCH 1/3] Add serializer support for set - closely modelled after map --- ebos/eclmpiserializer.hh | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/ebos/eclmpiserializer.hh b/ebos/eclmpiserializer.hh index abaa9e005..9d0e372e5 100644 --- a/ebos/eclmpiserializer.hh +++ b/ebos/eclmpiserializer.hh @@ -291,6 +291,44 @@ public: } } + template + void set(Set& data) + { + using Data = typename Set::value_type; + + auto handle = [&](auto& d) + { + if constexpr (is_vector::value) + this->template vector(d); + else if constexpr (is_ptr::value) + ptr(d); + else if constexpr (complexType) + d.serializeOp(*this); + else + (*this)(d); + }; + + if (m_op == Operation::PACKSIZE) { + m_packSize += Mpi::packSize(data.size(), m_comm); + for (auto& it : data) { + handle(it); + } + } else if (m_op == Operation::PACK) { + Mpi::pack(data.size(), m_buffer, m_position, m_comm); + for (auto& it : data) { + handle(it); + } + } else if (m_op == Operation::UNPACK) { + size_t size; + Mpi::unpack(size, m_buffer, m_position, m_comm); + for (size_t i = 0; i < size; ++i) { + Data entry; + handle(entry); + data.insert(entry); + } + } + } + //! \brief Call this to serialize data. //! \tparam T Type of class to serialize //! \param data Class to serialize From 7c358b17df7764820efef6707887881a7fbb2f85 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Fri, 24 Sep 2021 18:55:33 +0200 Subject: [PATCH 2/3] Add serialise test for Action::State --- tests/test_ParallelRestart.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 349bd3736..52432545f 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -50,6 +50,8 @@ #include #include #include +#include +#include #include #include #include @@ -566,6 +568,7 @@ TEST_FOR_TYPE2(Action, Actions) TEST_FOR_TYPE2(Action, ActionX) TEST_FOR_TYPE2(Action, AST) TEST_FOR_TYPE2(Action, ASTNode) +TEST_FOR_TYPE2(Action, State) TEST_FOR_TYPE(BCConfig) TEST_FOR_TYPE(BrineDensityTable) TEST_FOR_TYPE(ColumnSchema) From 064d13471109ad35d7db44c5312af43392d748ec Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Sat, 25 Sep 2021 11:51:59 +0200 Subject: [PATCH 3/3] Add serialize test for UDQState --- tests/test_ParallelRestart.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 52432545f..4d5c7f181 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -81,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -655,6 +656,7 @@ TEST_FOR_TYPE(UDQConfig) TEST_FOR_TYPE(UDQDefine) TEST_FOR_TYPE(UDQIndex) TEST_FOR_TYPE(UDQParams) +TEST_FOR_TYPE(UDQState) TEST_FOR_TYPE(UnitSystem) TEST_FOR_TYPE(Valve) TEST_FOR_TYPE(VFPInjTable)