From 987257554fc93bb504a184e6d62d1aee393dfa3e Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 6 Dec 2019 23:50:51 +0100 Subject: [PATCH] add mpi serialization for MLimits --- opm/simulators/utils/ParallelRestart.cpp | 2 ++ opm/simulators/utils/ParallelRestart.hpp | 2 ++ tests/test_ParallelRestart.cpp | 12 ++++++++++++ 3 files changed, 16 insertions(+) diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 80cd6b4ec..e9983686e 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -251,6 +252,7 @@ HANDLE_AS_POD(Eqldims) HANDLE_AS_POD(EquilRecord) HANDLE_AS_POD(FoamData) HANDLE_AS_POD(JFunc) +HANDLE_AS_POD(MLimits) HANDLE_AS_POD(PVTWRecord) HANDLE_AS_POD(PVCDORecord) HANDLE_AS_POD(Regdims) diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp index 904ad2671..d8b26fdc6 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -71,6 +71,7 @@ class FoamData; class InitConfig; class IOConfig; class JFunc; +class MLimits; class NNC; struct NNCdata; class OilVaporizationProperties; @@ -522,6 +523,7 @@ ADD_PACK_PROTOTYPES(Eqldims) ADD_PACK_PROTOTYPES(InitConfig) ADD_PACK_PROTOTYPES(IOConfig) ADD_PACK_PROTOTYPES(JFunc) +ADD_PACK_PROTOTYPES(MLimits) ADD_PACK_PROTOTYPES(NNC) ADD_PACK_PROTOTYPES(NNCdata) ADD_PACK_PROTOTYPES(OilVaporizationProperties) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 8b0d5317c..edce6d08b 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -1198,6 +1199,17 @@ BOOST_AUTO_TEST_CASE(Events) } +BOOST_AUTO_TEST_CASE(MLimits) +{ +#ifdef HAVE_MPI + Opm::MLimits val1{1,2,3,4,5,6,7,8,9,10,11,12}; + auto val2 = PackUnpack(val1); + BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2)); + BOOST_CHECK(val1 == std::get<0>(val2)); +#endif +} + + bool init_unit_test_func() { return true;