diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index d88f92949..cd1a97609 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -539,17 +538,6 @@ std::size_t packSize(const TableContainer& data, Dune::MPIHelper::MPICommunicato return res; } -std::size_t packSize(const InitConfig& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.getEquil(), comm) + - packSize(data.getFoamConfig(), comm) + - packSize(data.filleps(), comm) + - packSize(data.hasGravity(), comm) + - packSize(data.restartRequested(), comm) + - packSize(data.getRestartStep(), comm) + - packSize(data.getRestartRootName(), comm); -} - std::size_t packSize(const TimeMap& data, Dune::MPIHelper::MPICommunicator comm) { return packSize(data.timeList(), comm); @@ -1963,18 +1951,6 @@ void pack(const TableContainer& data, std::vector& buffer, int& position, } } -void pack(const InitConfig& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.getEquil(), buffer, position, comm); - pack(data.getFoamConfig(), buffer, position, comm); - pack(data.filleps(), buffer, position, comm); - pack(data.hasGravity(), buffer, position, comm); - pack(data.restartRequested(), buffer, position, comm); - pack(data.getRestartStep(), buffer, position, comm); - pack(data.getRestartRootName(), buffer, position, comm); -} - void pack(const TimeMap& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { @@ -3529,25 +3505,6 @@ void unpack(TableContainer& data, std::vector& buffer, int& position, } } -void unpack(InitConfig& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - Equil equil; - FoamConfig foam; - bool filleps, hasGravity, restartRequested; - int restartStep; - std::string restartRootName; - unpack(equil, buffer, position, comm); - unpack(foam, buffer, position, comm); - unpack(filleps, buffer, position, comm); - unpack(hasGravity, buffer, position, comm); - unpack(restartRequested, buffer, position, comm); - unpack(restartStep, buffer, position, comm); - unpack(restartRootName, buffer, position, comm); - data = InitConfig(equil, foam, filleps, hasGravity, - restartRequested, restartStep, restartRootName); -} - void unpack(TimeMap& 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 1fffec738..b5977e912 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -80,7 +80,6 @@ class EclipseConfig; class Eqldims; class EndpointScaling; class Events; -class InitConfig; class IOConfig; template class IOrderSet; class JFunc; @@ -528,7 +527,6 @@ ADD_PACK_PROTOTYPES(GuideRateModel) ADD_PACK_PROTOTYPES(Group) ADD_PACK_PROTOTYPES(Group::GroupInjectionProperties) ADD_PACK_PROTOTYPES(Group::GroupProductionProperties) -ADD_PACK_PROTOTYPES(InitConfig) ADD_PACK_PROTOTYPES(IOConfig) ADD_PACK_PROTOTYPES(JFunc) ADD_PACK_PROTOTYPES(Location) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 10cc15002..e3921a54a 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -835,7 +835,7 @@ BOOST_AUTO_TEST_CASE(InitConfig) Opm::InitConfig val1(Opm::Equil({getEquilRecord(), getEquilRecord()}), getFoamConfig(), true, true, true, 20, "test1"); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(InitConfig) #endif }