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 PvtwTable

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-17 10:07:46 +01:00
parent 720b305ef2
commit 46c2144275
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(MLimits)
HANDLE_AS_POD(PlmixparRecord) HANDLE_AS_POD(PlmixparRecord)
HANDLE_AS_POD(PlyvmhRecord) HANDLE_AS_POD(PlyvmhRecord)
HANDLE_AS_POD(PVTWRecord)
HANDLE_AS_POD(PVCDORecord) HANDLE_AS_POD(PVCDORecord)
HANDLE_AS_POD(Regdims) HANDLE_AS_POD(Regdims)
HANDLE_AS_POD(ROCKRecord) HANDLE_AS_POD(ROCKRecord)
@ -451,11 +450,6 @@ std::size_t packSize(const PvtoTable& data, Dune::MPIHelper::MPICommunicator com
return packSize(static_cast<const PvtxTable&>(data), comm); return packSize(static_cast<const PvtxTable&>(data), comm);
} }
std::size_t packSize(const PvtwTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const std::vector<PVTWRecord>&>(data), comm);
}
std::size_t packSize(const PvcdoTable& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const PvcdoTable& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(static_cast<const std::vector<PVCDORecord>&>(data), comm); return packSize(static_cast<const std::vector<PVCDORecord>&>(data), comm);
@ -1628,12 +1622,6 @@ void pack(const PvtoTable& data, std::vector<char>& buffer, int& position,
pack(static_cast<const PvtxTable&>(data), buffer, position, comm); pack(static_cast<const PvtxTable&>(data), buffer, position, comm);
} }
void pack(const PvtwTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(static_cast<const std::vector<PVTWRecord>&>(data), buffer, position, comm);
}
void pack(const PvcdoTable& data, std::vector<char>& buffer, int& position, void pack(const PvcdoTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -2881,14 +2869,6 @@ void unpack(PvtoTable& data, std::vector<char>& buffer, int& position,
unpack_pvt(data, buffer, position, comm); unpack_pvt(data, buffer, position, comm);
} }
void unpack(PvtwTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<PVTWRecord> pdata;
unpack(pdata, buffer, position, comm);
data = PvtwTable(pdata);
}
void unpack(PvcdoTable& data, std::vector<char>& buffer, int& position, void unpack(PvcdoTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@ -80,9 +80,7 @@ class PlmixparRecord;
class PlmixparTable; class PlmixparTable;
class PvtgTable; class PvtgTable;
class PvtoTable; class PvtoTable;
class PVTWRecord;
class PvtwsaltTable; class PvtwsaltTable;
class PvtwTable;
class Regdims; class Regdims;
class RestartConfig; class RestartConfig;
class RestartSchedule; class RestartSchedule;
@ -498,9 +496,7 @@ ADD_PACK_PROTOTYPES(PVCDORecord)
ADD_PACK_PROTOTYPES(PvcdoTable) ADD_PACK_PROTOTYPES(PvcdoTable)
ADD_PACK_PROTOTYPES(PvtgTable) ADD_PACK_PROTOTYPES(PvtgTable)
ADD_PACK_PROTOTYPES(PvtoTable) ADD_PACK_PROTOTYPES(PvtoTable)
ADD_PACK_PROTOTYPES(PVTWRecord)
ADD_PACK_PROTOTYPES(PvtwsaltTable) ADD_PACK_PROTOTYPES(PvtwsaltTable)
ADD_PACK_PROTOTYPES(PvtwTable)
ADD_PACK_PROTOTYPES(Regdims) ADD_PACK_PROTOTYPES(Regdims)
ADD_PACK_PROTOTYPES(RestartConfig) ADD_PACK_PROTOTYPES(RestartConfig)
ADD_PACK_PROTOTYPES(RestartKey) ADD_PACK_PROTOTYPES(RestartKey)

4
tests/test_ParallelRestart.cpp
View File

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