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 PvcdoTable

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-17 10:07:46 +01:00
parent 775e5a4802
commit 5feeedaacd
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,7 +308,6 @@ HANDLE_AS_POD(data::Segment)
HANDLE_AS_POD(MLimits)
HANDLE_AS_POD(PlmixparRecord)
HANDLE_AS_POD(PlyvmhRecord)
HANDLE_AS_POD(PVCDORecord)
HANDLE_AS_POD(Regdims)
HANDLE_AS_POD(ShrateRecord)
HANDLE_AS_POD(StandardCond)
@ -449,11 +448,6 @@ std::size_t packSize(const PvtoTable& data, Dune::MPIHelper::MPICommunicator com
return packSize(static_cast<const PvtxTable&>(data), comm);
}
std::size_t packSize(const PvcdoTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const std::vector<PVCDORecord>&>(data), comm);
}
std::size_t packSize(const ViscrefTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const std::vector<VISCREFRecord>&>(data), comm);
@ -1616,12 +1610,6 @@ void pack(const PvtoTable& data, std::vector<char>& buffer, int& position,
pack(static_cast<const PvtxTable&>(data), buffer, position, comm);
}
void pack(const PvcdoTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(static_cast<const std::vector<PVCDORecord>&>(data), buffer, position, comm);
}
void pack(const ViscrefTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
@ -2857,14 +2845,6 @@ void unpack(PvtoTable& data, std::vector<char>& buffer, int& position,
unpack_pvt(data, buffer, position, comm);
}
void unpack(PvcdoTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<PVCDORecord> pdata;
unpack(pdata, buffer, position, comm);
data = PvcdoTable(pdata);
}
void unpack(ViscrefTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{

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

@ -74,8 +74,6 @@ class PlyshlogTable;
class PlyvmhRecord;
class PlyvmhTable;
class PolyInjTable;
class PVCDORecord;
class PvcdoTable;
class PlmixparRecord;
class PlmixparTable;
class PvtgTable;
@ -490,8 +488,6 @@ ADD_PACK_PROTOTYPES(PlyshlogTable)
ADD_PACK_PROTOTYPES(PlyvmhRecord)
ADD_PACK_PROTOTYPES(PlyvmhTable)
ADD_PACK_PROTOTYPES(PolyInjTable)
ADD_PACK_PROTOTYPES(PVCDORecord)
ADD_PACK_PROTOTYPES(PvcdoTable)
ADD_PACK_PROTOTYPES(PvtgTable)
ADD_PACK_PROTOTYPES(PvtoTable)
ADD_PACK_PROTOTYPES(PvtwsaltTable)

4
tests/test_ParallelRestart.cpp
View File

@ -1062,7 +1062,7 @@ BOOST_AUTO_TEST_CASE(PVCDORecord)
{
#if HAVE_MPI
Opm::PVTWRecord val1{1.0, 2.0, 3.0, 4.0, 5.0};
auto val2 = PackUnpack(val1);
auto val2 = PackUnpack2(val1);
DO_CHECKS(PVTWRecord)
#endif
}
@ -1072,7 +1072,7 @@ BOOST_AUTO_TEST_CASE(PvcdoTable)
{
#if HAVE_MPI
Opm::PvcdoTable val1({Opm::PVCDORecord{1.0, 2.0, 3.0, 4.0, 5.0}});
auto val2 = PackUnpack(val1);
auto val2 = PackUnpack2(val1);
DO_CHECKS(PvcdoTable)
#endif
}