diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index ce58843e2..d1ccf6869 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -368,15 +367,6 @@ std::size_t packSize(const Well::WellInjectionProperties& data, packSize(data.controlMode, comm); } -std::size_t packSize(const WellConnections& data, - Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.ordering(), comm) + - packSize(data.getHeadI(), comm) + - packSize(data.getHeadJ(), comm) + - packSize(data.getConnections(), comm); -} - std::size_t packSize(const Well::WellProductionProperties& data, Dune::MPIHelper::MPICommunicator comm) { @@ -909,16 +899,6 @@ void pack(const Well::WellInjectionProperties& data, pack(data.controlMode, buffer, position, comm); } -void pack(const WellConnections& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.ordering(), buffer, position, comm); - pack(data.getHeadI(), buffer, position, comm); - pack(data.getHeadJ(), buffer, position, comm); - pack(data.getConnections(), buffer, position, comm); -} - void pack(const Well::WellProductionProperties& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -1503,22 +1483,6 @@ void unpack(Well::WellInjectionProperties& data, unpack(data.controlMode, buffer, position, comm); } -void unpack(WellConnections& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - int headI, headJ; - Connection::Order ordering; - std::vector connections; - - unpack(ordering, buffer, position, comm), - unpack(headI, buffer, position, comm), - unpack(headJ, buffer, position, comm), - unpack(connections, buffer, position, comm), - - data = WellConnections(ordering, headI, headJ, connections); -} - void unpack(Well::WellProductionProperties& 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 288ef5472..3d10b083c 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -51,7 +51,6 @@ class UnitSystem; class Valve; class VFPInjTable; class VFPProdTable; -class WellConnections; class WellSegments; namespace Mpi @@ -388,7 +387,6 @@ ADD_PACK_PROTOTYPES(Well) ADD_PACK_PROTOTYPES(WellType) ADD_PACK_PROTOTYPES(Well::WellInjectionProperties) ADD_PACK_PROTOTYPES(Well::WellProductionProperties) -ADD_PACK_PROTOTYPES(WellConnections) ADD_PACK_PROTOTYPES(WellSegments) } // end namespace Mpi diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 2af71705e..82cc5da08 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1474,7 +1474,7 @@ BOOST_AUTO_TEST_CASE(WellConnections) 12, 13.0, 14.0, true, 15, 16, 17.0); Opm::WellConnections val1(Opm::Connection::Order::TRACK, 1, 2, {conn, conn}); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(WellConnections) #endif }