diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index e84766aaf..4224a9ff8 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -335,11 +334,6 @@ std::size_t packSize(const WellType& data, Dune::MPIHelper::MPICommunicator comm packSize(data.preferred_phase(), comm); } -std::size_t packSize(const TimeMap& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.timeList(), comm); -} - template std::size_t packSize(const std::map& data, Dune::MPIHelper::MPICommunicator comm); @@ -1182,12 +1176,6 @@ void pack(const WellType& data, std::vector& buffer, int& position, pack(data.preferred_phase(), buffer, position, comm); } -void pack(const TimeMap& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.timeList(), buffer, position, comm); -} - void pack(const OilVaporizationProperties& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -2088,15 +2076,6 @@ void unpack(WellType& data, std::vector& buffer, int& position, Dune::MPIH data = WellType( producer, preferred_phase ); } -void unpack(TimeMap& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - std::vector timeList; - unpack(timeList, buffer, position, comm); - - data = TimeMap(timeList); -} - void unpack(OilVaporizationProperties& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp index e2d508f64..7f0290aec 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -444,7 +443,6 @@ ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(Segment) ADD_PACK_PROTOTYPES(SpiralICD) ADD_PACK_PROTOTYPES(std::string) -ADD_PACK_PROTOTYPES(TimeMap) ADD_PACK_PROTOTYPES(Tuning) ADD_PACK_PROTOTYPES(UDAValue) ADD_PACK_PROTOTYPES(UnitSystem) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 5483a5390..2540d5fe6 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -877,7 +877,7 @@ BOOST_AUTO_TEST_CASE(TimeMap) { #if HAVE_MPI Opm::TimeMap val1 = getTimeMap(); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(TimeMap) #endif }