diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 926d0b17d..d574360c1 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -428,20 +428,6 @@ std::size_t packSize(const AquiferConfig& data, Dune::MPIHelper::MPICommunicator packSize(data.connections(), comm); } -std::size_t packSize(const Aquancon::AquancCell& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.aquiferID, comm) + - packSize(data.global_index, comm) + - packSize(data.influx_coeff, comm) + - packSize(data.influx_mult, comm) + - packSize(data.face_dir, comm); -} - -std::size_t packSize(const Aquancon& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.data(), comm); -} - std::size_t packSize(const Rock2dTable& data, Dune::MPIHelper::MPICommunicator comm) { return packSize(data.pvmultValues(), comm) + @@ -1680,20 +1666,6 @@ void pack(const AquiferConfig& data, std::vector& buffer, int& position, pack(data.connections(), buffer, position, comm); } -void pack(const Aquancon::AquancCell& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) { - pack(data.aquiferID, buffer, position, comm); - pack(data.global_index, buffer, position, comm); - pack(data.influx_coeff, buffer, position, comm); - pack(data.influx_mult, buffer, position, comm); - pack(data.face_dir, buffer, position, comm); -} - -void pack(const Aquancon& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) { - pack(data.data(), buffer, position, comm); -} - void pack(const Rock2dTable& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { @@ -3021,25 +2993,6 @@ void unpack(Aquifetp& data, std::vector& buffer, int& position, Dune::MPIH data = Aquifetp(aquiferList); } - -void unpack(Aquancon::AquancCell& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) -{ - int aquiferID; - std::size_t globalIndex; - std::pair influxCoeff; - double influxMult; - FaceDir::DirEnum faceDir; - - unpack(aquiferID, buffer, position, comm); - unpack(globalIndex, buffer, position, comm); - unpack(influxCoeff, buffer, position, comm); - unpack(influxMult, buffer, position, comm); - unpack(faceDir, buffer, position, comm); - - data = Aquancon::AquancCell(aquiferID, globalIndex, influxCoeff, influxMult, faceDir); -} - - void unpack(AquiferConfig& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { Aquifetp fetp; AquiferCT ct; @@ -3051,14 +3004,6 @@ void unpack(AquiferConfig& data, std::vector& buffer, int& position, Dune: data = AquiferConfig(fetp, ct, conn); } - -void unpack(Aquancon& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) -{ - std::unordered_map> aquiferCells; - unpack(aquiferCells, buffer, position, comm); - data = Aquancon(aquiferCells); -} - 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 ceea9a247..1a1005582 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -467,8 +466,6 @@ ADD_PACK_PROTOTYPES(Action::Condition) ADD_PACK_PROTOTYPES(Action::Quantity) ADD_PACK_PROTOTYPES(Aqudims) ADD_PACK_PROTOTYPES(AquiferConfig) -ADD_PACK_PROTOTYPES(Aquancon) -ADD_PACK_PROTOTYPES(Aquancon::AquancCell) ADD_PACK_PROTOTYPES(AquiferCT) ADD_PACK_PROTOTYPES(AquiferCT::AQUCT_data) ADD_PACK_PROTOTYPES(Aquifetp) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 4accc1061..7a28480b4 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1783,7 +1783,7 @@ BOOST_AUTO_TEST_CASE(Aquancon) { #ifdef HAVE_MPI Opm::Aquancon val1 = getAquancon(); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(Aquancon); #endif }