diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 9d957085d..82f18df01 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -383,13 +383,6 @@ std::size_t packSize(const UnitSystem& data, packSize(data.use_count(), comm); } -std::size_t packSize(const WellSegments& data, - Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.compPressureDrop(), comm) + - packSize(data.segments(), comm); -} - std::size_t packSize(const Well& data, Dune::MPIHelper::MPICommunicator comm) { @@ -821,14 +814,6 @@ void pack(const UnitSystem& data, pack(data.use_count(), buffer, position, comm); } -void pack(const WellSegments& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.compPressureDrop(), buffer, position, comm); - pack(data.segments(), buffer, position, comm); -} - void pack(const Well& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -1324,19 +1309,6 @@ void unpack(UnitSystem& data, data = UnitSystem(name, type, dimensions, use_count); } -void unpack(WellSegments& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - WellSegments::CompPressureDrop compPressureDrop; - std::vector segments; - - unpack(compPressureDrop, buffer, position, comm); - unpack(segments, buffer, position, comm); - - data = WellSegments(compPressureDrop, segments); -} - void unpack(Well& 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 f347cecd3..2dc6e58ea 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -48,7 +48,6 @@ class UDAValue; class UnitSystem; class VFPInjTable; class VFPProdTable; -class WellSegments; namespace Mpi { @@ -379,7 +378,6 @@ ADD_PACK_PROTOTYPES(VFPInjTable) ADD_PACK_PROTOTYPES(VFPProdTable) ADD_PACK_PROTOTYPES(Well) ADD_PACK_PROTOTYPES(WellType) -ADD_PACK_PROTOTYPES(WellSegments) } // end namespace Mpi diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 456a9dbea..58c91e0d5 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1568,7 +1568,7 @@ BOOST_AUTO_TEST_CASE(WellSegments) Opm::WellSegments val1(Opm::WellSegments::CompPressureDrop::HF_, {seg, seg}); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(WellSegments) #endif }