diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 53debe0ca..4dee0f096 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -380,13 +380,6 @@ std::size_t packSize(const DenT& data, Dune::MPIHelper::MPICommunicator comm) return packSize(data.records(), comm); } -std::size_t packSize(const AquiferConfig& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.fetp(), comm) + - packSize(data.ct(), comm) + - packSize(data.connections(), comm); -} - std::size_t packSize(const Rock2dTable& data, Dune::MPIHelper::MPICommunicator comm) { return packSize(data.pvmultValues(), comm) + @@ -1575,13 +1568,6 @@ void pack(const DenT& data, std::vector& buffer, int& position, pack(data.records(), buffer, position, comm); } -void pack(const AquiferConfig& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) { - pack(data.fetp(), buffer, position, comm); - pack(data.ct(), buffer, position, comm); - pack(data.connections(), buffer, position, comm); -} - void pack(const Rock2dTable& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { @@ -2832,17 +2818,6 @@ void unpack(DenT& data, std::vector& buffer, int& position, Dune::MPIHelpe data = DenT( records ); } -void unpack(AquiferConfig& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { - Aquifetp fetp; - AquiferCT ct; - Aquancon conn; - - unpack(fetp, buffer, position, comm); - unpack(ct, buffer, position, comm); - unpack(conn, buffer, position, comm); - data = AquiferConfig(fetp, ct, conn); -} - void unpack(Rock2dTable& 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 26c8e263c..a8e887369 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -463,7 +462,6 @@ ADD_PACK_PROTOTYPES(Action::ASTNode) ADD_PACK_PROTOTYPES(Action::Condition) ADD_PACK_PROTOTYPES(Action::Quantity) ADD_PACK_PROTOTYPES(Aqudims) -ADD_PACK_PROTOTYPES(AquiferConfig) ADD_PACK_PROTOTYPES(BrineDensityTable) ADD_PACK_PROTOTYPES(ColumnSchema) ADD_PACK_PROTOTYPES(Connection) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 982b2a183..e3e88ee91 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1795,7 +1795,7 @@ BOOST_AUTO_TEST_CASE(AquferConfig) Opm::AquiferCT ct = getAquiferCT(); Opm::Aquancon conn = getAquancon(); Opm::AquiferConfig val1(fetp, ct, conn); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(AquiferConfig); #endif }