diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 22934ae1c..1f70c0bf5 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include @@ -352,12 +351,6 @@ std::size_t packSize(const WellType& data, Dune::MPIHelper::MPICommunicator comm packSize(data.preferred_phase(), comm); } -std::size_t packSize(const Rock2dtrTable& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.transMultValues(), comm) + - packSize(data.pressureValues(), comm); -} - std::size_t packSize(const TableSchema& data, Dune::MPIHelper::MPICommunicator comm) { return packSize(data.getColumns(), comm); @@ -1394,13 +1387,6 @@ void pack(const WellType& data, std::vector& buffer, int& position, pack(data.preferred_phase(), buffer, position, comm); } -void pack(const Rock2dtrTable& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.transMultValues(), buffer, position, comm); - pack(data.pressureValues(), buffer, position, comm); -} - void pack(const TableSchema& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { @@ -2475,16 +2461,6 @@ void unpack(WellType& data, std::vector& buffer, int& position, Dune::MPIH data = WellType( producer, preferred_phase ); } -void unpack(Rock2dtrTable& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - std::vector> transMultValues; - std::vector pressureValues; - unpack(transMultValues, buffer, position, comm); - unpack(pressureValues, buffer, position, comm); - data = Rock2dtrTable(transMultValues, pressureValues); -} - void unpack(TableSchema& 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 c25b3204d..338d7c5dc 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -74,7 +74,6 @@ class RestartConfig; class RestartSchedule; class RFTConfig; class RocktabTable; -class Rock2dtrTable; class Segment; class SimpleTable; class SkprpolyTable; @@ -465,7 +464,6 @@ ADD_PACK_PROTOTYPES(RestartKey) ADD_PACK_PROTOTYPES(RestartSchedule) ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(RFTConfig) -ADD_PACK_PROTOTYPES(Rock2dtrTable) ADD_PACK_PROTOTYPES(RocktabTable) ADD_PACK_PROTOTYPES(Segment) ADD_PACK_PROTOTYPES(SimpleTable) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index ebba371ff..5ae2771a2 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -725,7 +725,7 @@ BOOST_AUTO_TEST_CASE(Rock2dtrTable) { #if HAVE_MPI Opm::Rock2dtrTable val1({{1.0,2.0},{3.0,4.0}}, {1.0, 2.0, 3.0}); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(Rock2dtrTable) #endif }