diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index ba298ef1d..8f6b1175e 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -1653,12 +1653,6 @@ std::size_t packSize(const SolventDensityTable& data, return packSize(data.getSolventDensityColumn(), comm); } -std::size_t packSize(const GridDims& data, - Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.getNXYZ(), comm); -} - std::size_t packSize(const ShrateTable& data, Dune::MPIHelper::MPICommunicator comm) { return packSize(static_cast&>(data), comm); @@ -3256,13 +3250,6 @@ void pack(const SolventDensityTable& data, pack(data.getSolventDensityColumn(), buffer, position, comm); } -void pack(const GridDims& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.getNXYZ(), buffer, position, comm); -} - void pack(const ShrateTable& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { @@ -5531,16 +5518,6 @@ void unpack(SolventDensityTable& data, std::vector& buffer, int& position, data = SolventDensityTable(tableValues); } -void unpack(GridDims& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - std::array NXYZ; - - unpack(NXYZ, buffer, position, comm); - data = GridDims(NXYZ); -} - void unpack(ShrateTable& 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 b7499a76d..ced9681b8 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -89,7 +89,6 @@ class FaultCollection; class FaultFace; class FoamConfig; class FoamData; -class GridDims; class InitConfig; class IOConfig; template class IOrderSet; @@ -545,7 +544,6 @@ ADD_PACK_PROTOTYPES(GConSale) ADD_PACK_PROTOTYPES(GConSale::GCONSALEGroup) ADD_PACK_PROTOTYPES(GConSump) ADD_PACK_PROTOTYPES(GConSump::GCONSUMPGroup) -ADD_PACK_PROTOTYPES(GridDims) ADD_PACK_PROTOTYPES(GuideRateConfig) ADD_PACK_PROTOTYPES(GuideRateConfig::GroupTarget) ADD_PACK_PROTOTYPES(GuideRateConfig::WellTarget) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index d7b8a8780..a9e3de40b 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -2360,7 +2360,7 @@ BOOST_AUTO_TEST_CASE(GridDims) { #ifdef HAVE_MPI Opm::GridDims val1{ 1, 2, 3}; - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(GridDims) #endif }