diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 83d136b57..2a41d62f3 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -310,7 +310,6 @@ HANDLE_AS_POD(PlmixparRecord) HANDLE_AS_POD(PlyvmhRecord) HANDLE_AS_POD(PVCDORecord) HANDLE_AS_POD(Regdims) -HANDLE_AS_POD(ROCKRecord) HANDLE_AS_POD(ShrateRecord) HANDLE_AS_POD(StandardCond) HANDLE_AS_POD(Stone1exRecord) @@ -489,11 +488,6 @@ std::size_t packSize(const SkprwatTable& data, Dune::MPIHelper::MPICommunicator return packSize(static_cast(data), comm); } -std::size_t packSize(const RockTable& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(static_cast&>(data), comm); -} - namespace { struct SplitSimpleTables { @@ -1668,12 +1662,6 @@ void pack(const SkprwatTable& data, std::vector& buffer, int& position, pack(static_cast(data), buffer, position, comm); } -void pack(const RockTable& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(static_cast&>(data), buffer, position, comm); -} - void pack(const TableManager& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { @@ -2927,14 +2915,6 @@ void unpack(SkprwatTable& data, std::vector& buffer, int& position, unpack(static_cast(data), buffer, position, comm); } -void unpack(RockTable& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - std::vector pdata; - unpack(pdata, buffer, position, comm); - data = RockTable(pdata); -} - void unpack(TableManager& 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 67bb67024..8ed407d39 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -85,8 +85,6 @@ class Regdims; class RestartConfig; class RestartSchedule; class RFTConfig; -class ROCKRecord; -class RockTable; class RocktabTable; class Rock2dTable; class Rock2dtrTable; @@ -503,8 +501,6 @@ ADD_PACK_PROTOTYPES(RestartKey) ADD_PACK_PROTOTYPES(RestartSchedule) ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(RFTConfig) -ADD_PACK_PROTOTYPES(ROCKRecord) -ADD_PACK_PROTOTYPES(RockTable) ADD_PACK_PROTOTYPES(Rock2dTable) ADD_PACK_PROTOTYPES(Rock2dtrTable) ADD_PACK_PROTOTYPES(RocktabTable) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 4ed7ec729..84bf53681 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1202,7 +1202,7 @@ BOOST_AUTO_TEST_CASE(ROCKRecord) { #if HAVE_MPI Opm::ROCKRecord val1{1.0,2.0}; - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(ROCKRecord) #endif } @@ -1212,7 +1212,7 @@ BOOST_AUTO_TEST_CASE(RockTable) { #if HAVE_MPI Opm::RockTable val1({Opm::ROCKRecord{1.0,2.0}}); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(RockTable) #endif }