From eb53bb0db951aabbd4d3dfbc9ecd557e4fe23814 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 18 Mar 2020 09:29:02 +0100 Subject: [PATCH] remove old serialization support for DynamicVector --- opm/simulators/utils/ParallelRestart.cpp | 22 ---------------------- opm/simulators/utils/ParallelRestart.hpp | 12 ------------ 2 files changed, 34 deletions(-) diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index b59769191..a63b250f0 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -211,12 +211,6 @@ std::size_t packSize(const DynamicState& data, Dune::MPIHelper::MPICommunicat return packSize(split.first, comm) + packSize(split.second, comm); } -template -std::size_t packSize(const DynamicVector& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.data(), comm); -} - std::size_t packSize(const char* str, Dune::MPIHelper::MPICommunicator comm) { #if HAVE_MPI @@ -814,13 +808,6 @@ void pack(const DynamicState& data, std::vector& buffer, int& position, pack(split.second, buffer, position, comm); } -template -void pack(const DynamicVector& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.data(), buffer, position, comm); -} - void pack(const char* str, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { @@ -1458,15 +1445,6 @@ void unpack(DynamicState& data, std::vector& buffer, int& position, reconstructDynState(unique, indices, data); } -template -void unpack(DynamicVector& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - std::vector ddata; - unpack(ddata, buffer, position, comm); - data = DynamicVector(ddata); -} - void unpack(char* str, std::size_t length, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp index 1eb8b2f90..df0f90a1e 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -144,9 +143,6 @@ std::size_t packSize(const std::unordered_map& data, Dune::MPIHelpe template std::size_t packSize(const OrderedMap& data, Dune::MPIHelper::MPICommunicator comm); -template -std::size_t packSize(const DynamicVector& data, Dune::MPIHelper::MPICommunicator comm); - template std::size_t packSize(const DynamicState& data, Dune::MPIHelper::MPICommunicator comm); @@ -250,10 +246,6 @@ template void pack(const DynamicState& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm); -template -void pack(const DynamicVector& data, std::vector& buffer, - int& position, Dune::MPIHelper::MPICommunicator comm); - template void pack(const IOrderSet& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm); @@ -359,10 +351,6 @@ template void unpack(DynamicState& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm); -template -void unpack(DynamicVector& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm); - template void unpack(IOrderSet& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm);