diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index e91302c8f..f8a9ecc32 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -689,16 +688,10 @@ std::size_t packSize(const FoamConfig& data, Dune::MPIHelper::MPICommunicator co packSize(data.getMobilityModel(), comm); } -std::size_t packSize(const PolymerConfig& data, Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.shrate(), comm); -} - std::size_t packSize(const InitConfig& data, Dune::MPIHelper::MPICommunicator comm) { return packSize(data.getEquil(), comm) + packSize(data.getFoamConfig(), comm) + - packSize(data.getPolymerConfig(), comm) + packSize(data.filleps(), comm) + packSize(data.hasGravity(), comm) + packSize(data.restartRequested(), comm) + @@ -2318,18 +2311,11 @@ void pack(const FoamConfig& data, std::vector& buffer, int& position, pack(data.getMobilityModel(), buffer, position, comm); } -void pack(const PolymerConfig& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.shrate(), buffer, position, comm); -} - 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.getPolymerConfig(), buffer, position, comm); pack(data.filleps(), buffer, position, comm); pack(data.hasGravity(), buffer, position, comm); pack(data.restartRequested(), buffer, position, comm); @@ -4187,32 +4173,22 @@ void unpack(FoamConfig& data, std::vector& buffer, int& position, data = FoamConfig(records, transport_phase, mobility_model); } -void unpack(PolymerConfig& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - bool shrate; - unpack(shrate, buffer, position, comm); - data = PolymerConfig(shrate); -} - void unpack(InitConfig& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { Equil equil; FoamConfig foam; - PolymerConfig polymer; bool filleps, hasGravity, restartRequested; int restartStep; std::string restartRootName; unpack(equil, buffer, position, comm); unpack(foam, buffer, position, comm); - unpack(polymer, 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, polymer, filleps, hasGravity, + data = InitConfig(equil, foam, filleps, hasGravity, restartRequested, restartStep, restartRootName); } diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp index fb293283b..7ec733d3c 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -114,7 +114,6 @@ class PlyvmhTable; class PolyInjTable; class PVCDORecord; class PvcdoTable; -class PolymerConfig; class PlmixparRecord; class PlmixparTable; class PvtgTable; @@ -573,7 +572,6 @@ ADD_PACK_PROTOTYPES(PlymwinjTable) ADD_PACK_PROTOTYPES(PlyvmhRecord) ADD_PACK_PROTOTYPES(PlyvmhTable) ADD_PACK_PROTOTYPES(PolyInjTable) -ADD_PACK_PROTOTYPES(PolymerConfig) ADD_PACK_PROTOTYPES(PVCDORecord) ADD_PACK_PROTOTYPES(PvcdoTable) ADD_PACK_PROTOTYPES(PvtgTable) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 4f5bd6549..0b2f81231 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -807,21 +806,11 @@ BOOST_AUTO_TEST_CASE(FoamConfig) } -BOOST_AUTO_TEST_CASE(PolymerConfig) -{ -#if HAVE_MPI - Opm::PolymerConfig val1(true); - auto val2 = PackUnpack(val1); - DO_CHECKS(PolymerConfig) -#endif -} - - BOOST_AUTO_TEST_CASE(InitConfig) { #if HAVE_MPI Opm::InitConfig val1(Opm::Equil({getEquilRecord(), getEquilRecord()}), - getFoamConfig(), Opm::PolymerConfig(true), + getFoamConfig(), true, true, true, 20, "test1"); auto val2 = PackUnpack(val1); DO_CHECKS(InitConfig) @@ -2288,7 +2277,7 @@ BOOST_AUTO_TEST_CASE(EclipseConfig) Opm::IOConfig io(true, false, true, false, false, true, "test1", true, "test2", true, "test3", false); Opm::InitConfig init(Opm::Equil({getEquilRecord(), getEquilRecord()}), - getFoamConfig(), Opm::PolymerConfig(true), + getFoamConfig(), true, true, true, 20, "test1"); Opm::EclipseConfig val1{init, io};