From 00da8bcaaf6a281ba565c3e48b94a3e3defae890 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 13 Mar 2020 12:51:04 +0100 Subject: [PATCH] remove old mpi serialization support for Actdims --- opm/simulators/utils/ParallelRestart.cpp | 1 - opm/simulators/utils/ParallelRestart.hpp | 3 --- tests/test_ParallelRestart.cpp | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index daaaebba7..e3a96e3e8 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -334,7 +334,6 @@ std::size_t packSize(const std::array& data, Dune::MPIHelper::MPICommunicat return N*packSize(data[0], comm); } -HANDLE_AS_POD(Actdims) HANDLE_AS_POD(Aqudims) HANDLE_AS_POD(data::Connection) HANDLE_AS_POD(data::CurrentControl) diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp index 857c9ff03..09fa75198 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -55,8 +55,6 @@ namespace Opm { -class Actdims; - namespace Action { class Actions; class ActionX; @@ -469,7 +467,6 @@ void unpack(char* str, std::size_t length, std::vector& buffer, int& posit void unpack(T& data, std::vector& buffer, int& position, \ Dune::MPIHelper::MPICommunicator comm); -ADD_PACK_PROTOTYPES(Actdims) ADD_PACK_PROTOTYPES(Action::Actions) ADD_PACK_PROTOTYPES(Action::ActionX) ADD_PACK_PROTOTYPES(Action::AST) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 979f416b8..619c55729 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -981,7 +981,7 @@ BOOST_AUTO_TEST_CASE(Actdims) { #if HAVE_MPI Opm::Actdims val1(1,2,3,4); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(Actdims) #endif }