diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 47733c5b9..c424f6533 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -23,7 +23,6 @@ #include "ParallelRestart.hpp" #include -#include #include #include #include @@ -1477,13 +1476,6 @@ std::size_t packSize(const GuideRateConfig::GroupTarget& data, packSize(data.target, comm); } -std::size_t packSize(const EclipseConfig& data, - Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.init(), comm) + - packSize(data.io(), comm); -} - std::size_t packSize(const SolventDensityTable& data, Dune::MPIHelper::MPICommunicator comm) { @@ -2907,14 +2899,6 @@ void pack(const GuideRateConfig::GroupTarget& data, pack(data.target, buffer, position, comm); } -void pack(const EclipseConfig& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.init(), buffer, position, comm); - pack(data.io(), buffer, position, comm); -} - void pack(const SolventDensityTable& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -4920,18 +4904,6 @@ void unpack(GuideRateConfig::GroupTarget& data, unpack(data.target, buffer, position, comm); } -void unpack(EclipseConfig& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - InitConfig init; - IOConfig io; - - unpack(init, buffer, position, comm); - unpack(io, buffer, position, comm); - data = EclipseConfig(init, io); -} - void unpack(SolventDensityTable& 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 71222f605..55ac34756 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -76,7 +76,6 @@ class DENSITYRecord; class DensityTable; class Dimension; class EclHysterConfig; -class EclipseConfig; class Eqldims; class EndpointScaling; class Events; @@ -511,7 +510,6 @@ ADD_PACK_PROTOTYPES(DenT) ADD_PACK_PROTOTYPES(DenT::entry) ADD_PACK_PROTOTYPES(Dimension) ADD_PACK_PROTOTYPES(EclHysterConfig) -ADD_PACK_PROTOTYPES(EclipseConfig) ADD_PACK_PROTOTYPES(EndpointScaling) ADD_PACK_PROTOTYPES(Eqldims) ADD_PACK_PROTOTYPES(Events) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 60f1fff1b..7fa76ed78 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -2267,7 +2267,7 @@ BOOST_AUTO_TEST_CASE(EclipseConfig) true, true, true, 20, "test1"); Opm::EclipseConfig val1{init, io}; - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(EclipseConfig) #endif }