diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 294be7764..876bc2bca 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -341,12 +340,6 @@ std::size_t packSize(const VFPProdTable& data, packSize(data.getTable(), comm); } -std::size_t packSize(const WellTracerProperties& data, - Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.getConcentrations(), comm); -} - std::size_t packSize(const UDAValue& data, Dune::MPIHelper::MPICommunicator comm) { @@ -910,13 +903,6 @@ void pack(const VFPProdTable& data, pack(data.getTable(), buffer, position, comm); } -void pack(const WellTracerProperties& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.getConcentrations(), buffer, position, comm); -} - void pack(const UDAValue& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -1531,15 +1517,6 @@ void unpack(VFPProdTable& data, wfrAxis, gfrAxis, alqAxis, table); } -void unpack(WellTracerProperties& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - WellTracerProperties::ConcentrationMap ddata; - unpack(ddata, buffer, position, comm); - data = WellTracerProperties(ddata); -} - void unpack(UDAValue& 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 9e9c570ba..ef2485d47 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -54,7 +54,6 @@ class VFPInjTable; class VFPProdTable; class WellConnections; class WellSegments; -class WellTracerProperties; namespace Mpi { @@ -393,7 +392,6 @@ ADD_PACK_PROTOTYPES(Well::WellInjectionProperties) ADD_PACK_PROTOTYPES(Well::WellProductionProperties) ADD_PACK_PROTOTYPES(WellConnections) ADD_PACK_PROTOTYPES(WellSegments) -ADD_PACK_PROTOTYPES(WellTracerProperties) } // end namespace Mpi diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 3c41d671c..b93e804e2 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1383,7 +1383,7 @@ BOOST_AUTO_TEST_CASE(WellTracerProperties) { #ifdef HAVE_MPI Opm::WellTracerProperties val1({{"test", 1.0}, {"test2", 2.0}}); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(WellTracerProperties) #endif }