diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 73577d978..909d01bad 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -1101,15 +1100,6 @@ std::size_t packSize(const WListManager& data, return packSize(data.lists(), comm); } -std::size_t packSize(const UDQIndex& data, - Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.insert_index, comm) + - packSize(data.typed_insert_index, comm) + - packSize(data.action, comm) + - packSize(data.var_type, comm); -} - std::size_t packSize(const UDQConfig& data, Dune::MPIHelper::MPICommunicator comm) { @@ -2387,16 +2377,6 @@ void pack(const WListManager& data, pack(data.lists(), buffer, position, comm); } -void pack(const UDQIndex& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.insert_index, buffer, position, comm); - pack(data.typed_insert_index, buffer, position, comm); - pack(data.action, buffer, position, comm); - pack(data.var_type, buffer, position, comm); -} - void pack(const UDQConfig& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -4135,16 +4115,6 @@ void unpack(WListManager& data, data = WListManager(lists); } -void unpack(UDQIndex& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - unpack(data.insert_index, buffer, position, comm); - unpack(data.typed_insert_index, buffer, position, comm); - unpack(data.action, buffer, position, comm); - unpack(data.var_type, buffer, position, comm); -} - void unpack(UDQConfig& 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 944d7d2bd..0a072673b 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -124,7 +124,6 @@ class TlmixparTable; class Tuning; class UDAValue; class UDQConfig; -class UDQIndex; class UDQParams; class UnitSystem; class Valve; @@ -562,7 +561,6 @@ ADD_PACK_PROTOTYPES(TlmixparTable) ADD_PACK_PROTOTYPES(Tuning) ADD_PACK_PROTOTYPES(UDAValue) ADD_PACK_PROTOTYPES(UDQConfig) -ADD_PACK_PROTOTYPES(UDQIndex) ADD_PACK_PROTOTYPES(UDQParams) ADD_PACK_PROTOTYPES(UnitSystem) ADD_PACK_PROTOTYPES(Valve) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index a0c565f7a..357bc0dbc 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1707,7 +1707,7 @@ BOOST_AUTO_TEST_CASE(UDQIndex) { #ifdef HAVE_MPI Opm::UDQIndex val1(1, 2, Opm::UDQAction::ASSIGN, Opm::UDQVarType::WELL_VAR); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(UDQIndex) #endif }