diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index f5d02b551..73577d978 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -1102,15 +1101,6 @@ std::size_t packSize(const WListManager& data, return packSize(data.lists(), comm); } -std::size_t packSize(const UDQDefine& data, - Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.keyword(), comm) + - packSize(data.getAst(), comm) + - packSize(data.var_type(), comm) + - packSize(data.input_string(), comm); -} - std::size_t packSize(const UDQIndex& data, Dune::MPIHelper::MPICommunicator comm) { @@ -2397,16 +2387,6 @@ void pack(const WListManager& data, pack(data.lists(), buffer, position, comm); } -void pack(const UDQDefine& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.keyword(), buffer, position, comm); - pack(data.getAst(), buffer, position, comm); - pack(data.var_type(), buffer, position, comm); - pack(data.input_string(), buffer, position, comm); -} - void pack(const UDQIndex& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -4155,22 +4135,6 @@ void unpack(WListManager& data, data = WListManager(lists); } -void unpack(UDQDefine& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - std::string keyword; - std::shared_ptr ast; - UDQVarType varType; - std::string string_data; - - unpack(keyword, buffer, position, comm); - unpack(ast, buffer, position, comm); - unpack(varType, buffer, position, comm); - unpack(string_data, buffer, position, comm); - data = UDQDefine(keyword, ast, varType, string_data); -} - void unpack(UDQIndex& 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 ff0402a89..944d7d2bd 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 UDQDefine; class UDQIndex; class UDQParams; class UnitSystem; @@ -563,7 +562,6 @@ ADD_PACK_PROTOTYPES(TlmixparTable) ADD_PACK_PROTOTYPES(Tuning) ADD_PACK_PROTOTYPES(UDAValue) ADD_PACK_PROTOTYPES(UDQConfig) -ADD_PACK_PROTOTYPES(UDQDefine) ADD_PACK_PROTOTYPES(UDQIndex) ADD_PACK_PROTOTYPES(UDQParams) ADD_PACK_PROTOTYPES(UnitSystem) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index e12c7acc4..a0c565f7a 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1685,7 +1685,7 @@ BOOST_AUTO_TEST_CASE(UDQDefine) "test", 1.0, {"test1", "test2"}, n0, n0); Opm::UDQDefine val1("test", std::make_shared(n1), Opm::UDQVarType::NONE, "test2"); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(UDQDefine) #endif }