From 8a3cb589814c45b7ccbb1fd35f58a1c0cd41e1a8 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 17 Mar 2020 10:07:46 +0100 Subject: [PATCH] remove old serialization support for Aqudims --- opm/simulators/utils/ParallelRestart.cpp | 2 -- opm/simulators/utils/ParallelRestart.hpp | 2 -- 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 cd9e4cd86..360f9cb6d 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -283,7 +282,6 @@ std::size_t packSize(const std::array& data, Dune::MPIHelper::MPICommunicat return N*packSize(data[0], comm); } -HANDLE_AS_POD(Aqudims) HANDLE_AS_POD(data::Connection) HANDLE_AS_POD(data::CurrentControl) HANDLE_AS_POD(data::Rates) diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp index 01b96a475..1c81e2c9f 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -57,7 +57,6 @@ namespace Action { class Quantity; } -class Aqudims; class Connection; class DeckItem; class DeckRecord; @@ -416,7 +415,6 @@ ADD_PACK_PROTOTYPES(Action::AST) ADD_PACK_PROTOTYPES(Action::ASTNode) ADD_PACK_PROTOTYPES(Action::Condition) ADD_PACK_PROTOTYPES(Action::Quantity) -ADD_PACK_PROTOTYPES(Aqudims) ADD_PACK_PROTOTYPES(Connection) ADD_PACK_PROTOTYPES(data::CellData) ADD_PACK_PROTOTYPES(data::Connection) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 6c97b870c..9cc2ac6dd 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1192,7 +1192,7 @@ BOOST_AUTO_TEST_CASE(Aqudims) { #if HAVE_MPI Opm::Aqudims val1(1,2,3,4,5,6,7,8); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(Aqudims) #endif }