diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 3da00618c..f9a0b1168 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -305,7 +305,6 @@ HANDLE_AS_POD(data::Connection) HANDLE_AS_POD(data::CurrentControl) HANDLE_AS_POD(data::Rates) HANDLE_AS_POD(data::Segment) -HANDLE_AS_POD(DENSITYRecord) HANDLE_AS_POD(MLimits) HANDLE_AS_POD(PlmixparRecord) HANDLE_AS_POD(PlyvmhRecord) @@ -462,11 +461,6 @@ std::size_t packSize(const PvcdoTable& data, Dune::MPIHelper::MPICommunicator co return packSize(static_cast&>(data), comm); } -std::size_t packSize(const DensityTable& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(static_cast&>(data), comm); -} - std::size_t packSize(const ViscrefTable& data, Dune::MPIHelper::MPICommunicator comm) { return packSize(static_cast&>(data), comm); @@ -1646,12 +1640,6 @@ void pack(const PvcdoTable& data, std::vector& buffer, int& position, pack(static_cast&>(data), buffer, position, comm); } -void pack(const DensityTable& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(static_cast&>(data), buffer, position, comm); -} - void pack(const ViscrefTable& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { @@ -2909,14 +2897,6 @@ void unpack(PvcdoTable& data, std::vector& buffer, int& position, data = PvcdoTable(pdata); } -void unpack(DensityTable& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - std::vector pdata; - unpack(pdata, buffer, position, comm); - data = DensityTable(pdata); -} - void unpack(ViscrefTable& 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 16a6bdda8..ce54d9639 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -61,8 +61,6 @@ class Aqudims; class Connection; class DeckItem; class DeckRecord; -class DENSITYRecord; -class DensityTable; class Dimension; class Events; template class IOrderSet; @@ -471,8 +469,6 @@ ADD_PACK_PROTOTYPES(Deck) ADD_PACK_PROTOTYPES(DeckItem) ADD_PACK_PROTOTYPES(DeckKeyword) ADD_PACK_PROTOTYPES(DeckRecord) -ADD_PACK_PROTOTYPES(DENSITYRecord) -ADD_PACK_PROTOTYPES(DensityTable) ADD_PACK_PROTOTYPES(Dimension) ADD_PACK_PROTOTYPES(Events) ADD_PACK_PROTOTYPES(GConSale) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 0f38cd559..aadb46540 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1082,7 +1082,7 @@ BOOST_AUTO_TEST_CASE(DENSITYRecord) { #if HAVE_MPI Opm::DENSITYRecord val1{1.0, 2.0, 3.0}; - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(DENSITYRecord) #endif } @@ -1092,7 +1092,7 @@ BOOST_AUTO_TEST_CASE(DensityTable) { #if HAVE_MPI Opm::DensityTable val1({Opm::DENSITYRecord{1.0, 2.0, 3.0}}); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(DensityTable) #endif }