OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove old serialization support for GridDims

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-12 15:35:59 +01:00
parent a576c786dd
commit cdb19da0bd
3 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
opm/simulators/utils/ParallelRestart.cpp
View File

@ -1653,12 +1653,6 @@ std::size_t packSize(const SolventDensityTable& data,
return packSize(data.getSolventDensityColumn(), comm); 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) std::size_t packSize(const ShrateTable& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(static_cast<const std::vector<ShrateRecord>&>(data), comm); return packSize(static_cast<const std::vector<ShrateRecord>&>(data), comm);
@ -3256,13 +3250,6 @@ void pack(const SolventDensityTable& data,
pack(data.getSolventDensityColumn(), buffer, position, comm); pack(data.getSolventDensityColumn(), buffer, position, comm);
} }
void pack(const GridDims& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getNXYZ(), buffer, position, comm);
}
void pack(const ShrateTable& data, std::vector<char>& buffer, int& position, void pack(const ShrateTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -5531,16 +5518,6 @@ void unpack(SolventDensityTable& data, std::vector<char>& buffer, int& position,
data = SolventDensityTable(tableValues); data = SolventDensityTable(tableValues);
} }
void unpack(GridDims& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::array<int,3> NXYZ;
unpack(NXYZ, buffer, position, comm);
data = GridDims(NXYZ);
}
void unpack(ShrateTable& data, std::vector<char>& buffer, int& position, void unpack(ShrateTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

2
opm/simulators/utils/ParallelRestart.hpp
View File

@ -89,7 +89,6 @@ class FaultCollection;
class FaultFace; class FaultFace;
class FoamConfig; class FoamConfig;
class FoamData; class FoamData;
class GridDims;
class InitConfig; class InitConfig;
class IOConfig; class IOConfig;
template<class T> class IOrderSet; template<class T> class IOrderSet;
@ -545,7 +544,6 @@ ADD_PACK_PROTOTYPES(GConSale)
ADD_PACK_PROTOTYPES(GConSale::GCONSALEGroup) ADD_PACK_PROTOTYPES(GConSale::GCONSALEGroup)
ADD_PACK_PROTOTYPES(GConSump) ADD_PACK_PROTOTYPES(GConSump)
ADD_PACK_PROTOTYPES(GConSump::GCONSUMPGroup) ADD_PACK_PROTOTYPES(GConSump::GCONSUMPGroup)
ADD_PACK_PROTOTYPES(GridDims)
ADD_PACK_PROTOTYPES(GuideRateConfig) ADD_PACK_PROTOTYPES(GuideRateConfig)
ADD_PACK_PROTOTYPES(GuideRateConfig::GroupTarget) ADD_PACK_PROTOTYPES(GuideRateConfig::GroupTarget)
ADD_PACK_PROTOTYPES(GuideRateConfig::WellTarget) ADD_PACK_PROTOTYPES(GuideRateConfig::WellTarget)

2
tests/test_ParallelRestart.cpp
View File

@ -2360,7 +2360,7 @@ BOOST_AUTO_TEST_CASE(GridDims)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::GridDims val1{ 1, 2, 3}; Opm::GridDims val1{ 1, 2, 3};
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(GridDims) DO_CHECKS(GridDims)
#endif #endif
} }