diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index d4ed5a78f..93ffd5a40 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -542,15 +542,6 @@ std::size_t packSize(const RestartConfig& data, Dune::MPIHelper::MPICommunicator packSize(data.saveKeywords(), comm); } -std::size_t packSize(const UDQParams& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.reseed(), comm) + - packSize(data.rand_seed(), comm) + - packSize(data.range(), comm) + - packSize(data.undefinedValue(), comm) + - packSize(data.cmpEpsilon(), comm); -} - std::size_t packSize(const PvtxTable& data, Dune::MPIHelper::MPICommunicator comm) { return packSize(data.getOuterColumnSchema(), comm) + @@ -1815,16 +1806,6 @@ void pack(const RestartConfig& data, std::vector& buffer, int& position, pack(data.saveKeywords(), buffer, position, comm); } -void pack(const UDQParams& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.reseed(), buffer, position, comm); - pack(data.rand_seed(), buffer, position, comm); - pack(data.range(), buffer, position, comm); - pack(data.undefinedValue(), buffer, position, comm); - pack(data.cmpEpsilon(), buffer, position, comm); -} - void pack(const PvtxTable& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { @@ -3224,21 +3205,6 @@ void unpack(RestartConfig& data, std::vector& buffer, int& position, restart_keyw, save_keyw); } -void unpack(UDQParams& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - bool reseed; - int rand_seed; - double range, undefVal, cmp_eps; - - unpack(reseed, buffer, position, comm); - unpack(rand_seed, buffer, position, comm); - unpack(range, buffer, position, comm); - unpack(undefVal, buffer, position, comm); - unpack(cmp_eps, buffer, position, comm); - data = UDQParams(reseed, rand_seed, range, undefVal, cmp_eps); -} - template void unpack_pvt(PVTType& 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 8a422f3ab..ceea9a247 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -123,7 +123,6 @@ class TlmixparRecord; class TlmixparTable; class Tuning; class UDAValue; -class UDQParams; class UnitSystem; class Valve; class VFPInjTable; @@ -559,7 +558,6 @@ ADD_PACK_PROTOTYPES(TlmixparRecord) ADD_PACK_PROTOTYPES(TlmixparTable) ADD_PACK_PROTOTYPES(Tuning) ADD_PACK_PROTOTYPES(UDAValue) -ADD_PACK_PROTOTYPES(UDQParams) ADD_PACK_PROTOTYPES(UnitSystem) ADD_PACK_PROTOTYPES(Valve) ADD_PACK_PROTOTYPES(VFPInjTable) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 0684d5592..4accc1061 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -961,7 +961,7 @@ BOOST_AUTO_TEST_CASE(UDQParams) { #if HAVE_MPI Opm::UDQParams val1(true, 1, 2.0, 3.0, 4.0); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(UDQParams) #endif }