diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 4224a9ff8..64272de54 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -338,17 +337,6 @@ template std::size_t packSize(const std::map& data, Dune::MPIHelper::MPICommunicator comm); -std::size_t packSize(const OilVaporizationProperties& data, - Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.getType(), comm) + - packSize(data.vap1(), comm) + - packSize(data.vap2(), comm) + - packSize(data.maxDRSDT(), comm) + - packSize(data.maxDRSDT_allCells(), comm) + - packSize(data.maxDRVDT(), comm); -} - std::size_t packSize(const Events& data, Dune::MPIHelper::MPICommunicator comm) { @@ -1176,19 +1164,6 @@ void pack(const WellType& data, std::vector& buffer, int& position, pack(data.preferred_phase(), buffer, position, comm); } -void pack(const OilVaporizationProperties& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.getType(), buffer, position, comm); - pack(data.vap1(), buffer, position, comm); - pack(data.vap2(), buffer, position, comm); - pack(data.maxDRSDT(), buffer, position, comm); - pack(data.maxDRSDT_allCells(), buffer, position, comm); - pack(data.maxDRVDT(), buffer, position, comm); - -} - void pack(const Events& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -2076,24 +2051,6 @@ void unpack(WellType& data, std::vector& buffer, int& position, Dune::MPIH data = WellType( producer, preferred_phase ); } -void unpack(OilVaporizationProperties& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - OilVaporizationProperties::OilVaporization type; - double vap1, vap2; - std::vector maxDRSDT, maxDRVDT; - std::vector maxDRSDT_allCells; - unpack(type, buffer, position, comm); - unpack(vap1, buffer, position, comm); - unpack(vap2, buffer, position, comm); - unpack(maxDRSDT, buffer, position, comm); - unpack(maxDRSDT_allCells, buffer, position, comm); - unpack(maxDRVDT, buffer, position, comm); - data = OilVaporizationProperties(type, vap1, vap2, maxDRSDT, - maxDRSDT_allCells, maxDRVDT); -} - void unpack(Events& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -3068,7 +3025,6 @@ INSTANTIATE_PACK(std::unordered_map) INSTANTIATE_PACK(std::pair) INSTANTIATE_PACK(std::pair) INSTANTIATE_PACK(DynamicState) -INSTANTIATE_PACK(DynamicState) INSTANTIATE_PACK(DynamicState>) INSTANTIATE_PACK(DynamicState>) INSTANTIATE_PACK(DynamicState>) diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp index 7f0290aec..1839ab0ee 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -65,7 +65,6 @@ template class IOrderSet; class Location; class MessageLimits; class MLimits; -class OilVaporizationProperties; class Segment; class SpiralICD; class Tuning; @@ -437,7 +436,6 @@ ADD_PACK_PROTOTYPES(Group::GroupProductionProperties) ADD_PACK_PROTOTYPES(Location) ADD_PACK_PROTOTYPES(MessageLimits) ADD_PACK_PROTOTYPES(MLimits) -ADD_PACK_PROTOTYPES(OilVaporizationProperties) ADD_PACK_PROTOTYPES(RestartKey) ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(Segment) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index 2540d5fe6..9d27e4130 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1274,12 +1274,12 @@ BOOST_AUTO_TEST_CASE(OilVaporizationProperties) Opm::OilVaporizationProperties val1(VapType::VAPPARS, 1.0, 2.0, {5.0, 6.0}, {false, true}, {7.0, 8.0}); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(OilVaporizationProperties) val1 = Opm::OilVaporizationProperties(VapType::DRDT, 1.0, 2.0, {5.0, 6.0}, {false, true}, {7.0, 8.0}); - val2 = PackUnpack(val1); + val2 = PackUnpack2(val1); DO_CHECKS(OilVaporizationProperties) #endif }