diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 52585b8c7..daaaebba7 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -1411,14 +1411,6 @@ std::size_t packSize(const TimeStampUTC& data, packSize(data.microseconds(), comm); } -std::size_t packSize(const EclHysterConfig& data, - Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.active(), comm) + - packSize(data.pcHysteresisModel(), comm) + - packSize(data.krHysteresisModel(), comm); -} - std::size_t packSize(const JFunc& data, Dune::MPIHelper::MPICommunicator comm) { @@ -2816,15 +2808,6 @@ void pack(const TimeStampUTC& data, pack(data.microseconds(), buffer, position, comm); } -void pack(const EclHysterConfig& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.active(), buffer, position, comm); - pack(data.pcHysteresisModel(), buffer, position, comm); - pack(data.krHysteresisModel(), buffer, position, comm); -} - void pack(const JFunc& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -4793,20 +4776,6 @@ void unpack(TimeStampUTC& data, data = TimeStampUTC(ymd, hour, minutes, seconds, usec); } - -void unpack(EclHysterConfig& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - bool active; - int pcHysteresisModel, krHysteresisModel; - - unpack(active, buffer, position, comm); - unpack(pcHysteresisModel, buffer, position, comm); - unpack(krHysteresisModel, buffer, position, comm); - data = EclHysterConfig(active, pcHysteresisModel, krHysteresisModel); -} - void unpack(JFunc& 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 b5d017e0f..857c9ff03 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -75,7 +75,6 @@ class DeckRecord; class DENSITYRecord; class DensityTable; class Dimension; -class EclHysterConfig; class Eqldims; class Events; template class IOrderSet; @@ -505,7 +504,6 @@ ADD_PACK_PROTOTYPES(DensityTable) ADD_PACK_PROTOTYPES(DenT) ADD_PACK_PROTOTYPES(DenT::entry) ADD_PACK_PROTOTYPES(Dimension) -ADD_PACK_PROTOTYPES(EclHysterConfig) ADD_PACK_PROTOTYPES(Eqldims) ADD_PACK_PROTOTYPES(Events) ADD_PACK_PROTOTYPES(GConSale) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index d8ecccd29..979f416b8 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -971,7 +971,7 @@ BOOST_AUTO_TEST_CASE(EclHysterConfig) { #if HAVE_MPI Opm::EclHysterConfig val1(true, 1, 2); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(EclHysterConfig) #endif }