diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index af17b50af..53debe0ca 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -380,22 +380,6 @@ std::size_t packSize(const DenT& data, Dune::MPIHelper::MPICommunicator comm) return packSize(data.records(), comm); } -std::size_t packSize(const Aquifetp& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.data(), comm); -} - -std::size_t packSize(const Aquifetp::AQUFETP_data& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.aquiferID, comm) + - packSize(data.pvttableID, comm) + - packSize(data.J, comm) + - packSize(data.C_t, comm) + - packSize(data.V0, comm) + - packSize(data.d0, comm) + - packSize(data.p0, comm); -} - std::size_t packSize(const AquiferConfig& data, Dune::MPIHelper::MPICommunicator comm) { return packSize(data.fetp(), comm) + @@ -1580,17 +1564,6 @@ void pack(const RestartValue& data, std::vector& buffer, int& position, pack(data.extra, buffer, position, comm); } -void pack(const Aquifetp::AQUFETP_data& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) { - pack(data.aquiferID, buffer, position, comm); - pack(data.pvttableID, buffer, position, comm); - pack(data.J, buffer, position, comm); - pack(data.C_t, buffer, position, comm); - pack(data.V0, buffer, position, comm); - pack(data.d0, buffer, position, comm); - pack(data.p0, buffer, position, comm); -} - void pack(const WellType& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { pack(data.producer(), buffer, position, comm); @@ -1602,12 +1575,6 @@ void pack(const DenT& data, std::vector& buffer, int& position, pack(data.records(), buffer, position, comm); } - -void pack(const Aquifetp& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) { - pack(data.data(), buffer, position, comm); -} - void pack(const AquiferConfig& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { pack(data.fetp(), buffer, position, comm); @@ -2865,30 +2832,6 @@ void unpack(DenT& data, std::vector& buffer, int& position, Dune::MPIHelpe data = DenT( records ); } -void unpack(Aquifetp::AQUFETP_data& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) -{ - int aquiferID; - int pvttableID; - double J, C_t, V0, d0; - std::pair p0; - - unpack(aquiferID, buffer, position, comm); - unpack(pvttableID, buffer, position, comm); - unpack(J, buffer, position, comm); - unpack(C_t, buffer, position, comm); - unpack(V0, buffer, position, comm); - unpack(d0, buffer, position, comm); - unpack(p0, buffer, position, comm); - data = Aquifetp::AQUFETP_data(aquiferID, pvttableID, J, C_t, V0, d0, p0); -} - -void unpack(Aquifetp& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) -{ - std::vector aquiferList; - unpack(aquiferList, buffer, position, comm); - data = Aquifetp(aquiferList); -} - void unpack(AquiferConfig& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { Aquifetp fetp; AquiferCT ct; diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp index a657dea09..26c8e263c 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -465,8 +464,6 @@ ADD_PACK_PROTOTYPES(Action::Condition) ADD_PACK_PROTOTYPES(Action::Quantity) ADD_PACK_PROTOTYPES(Aqudims) ADD_PACK_PROTOTYPES(AquiferConfig) -ADD_PACK_PROTOTYPES(Aquifetp) -ADD_PACK_PROTOTYPES(Aquifetp::AQUFETP_data) 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 48765c1af..982b2a183 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1773,7 +1773,7 @@ BOOST_AUTO_TEST_CASE(Aquifetp) { #ifdef HAVE_MPI Opm::Aquifetp val1 = getAquifetp(); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(Aquifetp); #endif }