diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 76d086f62..0996eff3c 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -312,7 +312,6 @@ HANDLE_AS_POD(StandardCond) HANDLE_AS_POD(Tabdims) HANDLE_AS_POD(TimeStampUTC::YMD) HANDLE_AS_POD(Tuning) -HANDLE_AS_POD(VISCREFRecord) HANDLE_AS_POD(WATDENTRecord) HANDLE_AS_POD(WellBrineProperties) HANDLE_AS_POD(WellFoamProperties) @@ -444,11 +443,6 @@ std::size_t packSize(const PvtoTable& data, Dune::MPIHelper::MPICommunicator com return packSize(static_cast(data), comm); } -std::size_t packSize(const ViscrefTable& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(static_cast&>(data), comm); -} - std::size_t packSize(const WatdentTable& data, Dune::MPIHelper::MPICommunicator comm) { return packSize(static_cast&>(data), comm); @@ -1586,12 +1580,6 @@ void pack(const PvtoTable& data, std::vector& buffer, int& position, pack(static_cast(data), buffer, position, comm); } -void pack(const ViscrefTable& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(static_cast&>(data), buffer, position, comm); -} - void pack(const WatdentTable& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { @@ -2797,14 +2785,6 @@ void unpack(PvtoTable& data, std::vector& buffer, int& position, unpack_pvt(data, buffer, position, comm); } -void unpack(ViscrefTable& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - std::vector pdata; - unpack(pdata, buffer, position, comm); - data = ViscrefTable(pdata); -} - void unpack(WatdentTable& 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 c5657245c..35ec25bc2 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -103,8 +103,6 @@ class UnitSystem; class Valve; class VFPInjTable; class VFPProdTable; -class VISCREFRecord; -class ViscrefTable; class WATDENTRecord; class WatdentTable; class WellConnections; @@ -510,8 +508,6 @@ ADD_PACK_PROTOTYPES(UnitSystem) ADD_PACK_PROTOTYPES(Valve) ADD_PACK_PROTOTYPES(VFPInjTable) ADD_PACK_PROTOTYPES(VFPProdTable) -ADD_PACK_PROTOTYPES(VISCREFRecord) -ADD_PACK_PROTOTYPES(ViscrefTable) ADD_PACK_PROTOTYPES(WATDENTRecord) ADD_PACK_PROTOTYPES(WatdentTable) ADD_PACK_PROTOTYPES(Well) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 2f84f5b76..0274ce1e3 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1102,7 +1102,7 @@ BOOST_AUTO_TEST_CASE(VISCREFRecord) { #if HAVE_MPI Opm::VISCREFRecord val1{1.0, 2.0}; - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(VISCREFRecord) #endif } @@ -1112,7 +1112,7 @@ BOOST_AUTO_TEST_CASE(ViscrefTable) { #if HAVE_MPI Opm::ViscrefTable val1({Opm::VISCREFRecord{1.0, 2.0}}); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(ViscrefTable) #endif }