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 DensityTable

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-17 10:07:46 +01:00
parent 92dd3314d7
commit 720b305ef2
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

@ -305,7 +305,6 @@ HANDLE_AS_POD(data::Connection)
HANDLE_AS_POD(data::CurrentControl) HANDLE_AS_POD(data::CurrentControl)
HANDLE_AS_POD(data::Rates) HANDLE_AS_POD(data::Rates)
HANDLE_AS_POD(data::Segment) HANDLE_AS_POD(data::Segment)
HANDLE_AS_POD(DENSITYRecord)
HANDLE_AS_POD(MLimits) HANDLE_AS_POD(MLimits)
HANDLE_AS_POD(PlmixparRecord) HANDLE_AS_POD(PlmixparRecord)
HANDLE_AS_POD(PlyvmhRecord) HANDLE_AS_POD(PlyvmhRecord)
@ -462,11 +461,6 @@ std::size_t packSize(const PvcdoTable& data, Dune::MPIHelper::MPICommunicator co
return packSize(static_cast<const std::vector<PVCDORecord>&>(data), comm); return packSize(static_cast<const std::vector<PVCDORecord>&>(data), comm);
} }
std::size_t packSize(const DensityTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const std::vector<DENSITYRecord>&>(data), comm);
}
std::size_t packSize(const ViscrefTable& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const ViscrefTable& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(static_cast<const std::vector<VISCREFRecord>&>(data), comm); return packSize(static_cast<const std::vector<VISCREFRecord>&>(data), comm);
@ -1646,12 +1640,6 @@ void pack(const PvcdoTable& data, std::vector<char>& buffer, int& position,
pack(static_cast<const std::vector<PVCDORecord>&>(data), buffer, position, comm); pack(static_cast<const std::vector<PVCDORecord>&>(data), buffer, position, comm);
} }
void pack(const DensityTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(static_cast<const std::vector<DENSITYRecord>&>(data), buffer, position, comm);
}
void pack(const ViscrefTable& data, std::vector<char>& buffer, int& position, void pack(const ViscrefTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -2909,14 +2897,6 @@ void unpack(PvcdoTable& data, std::vector<char>& buffer, int& position,
data = PvcdoTable(pdata); data = PvcdoTable(pdata);
} }
void unpack(DensityTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<DENSITYRecord> pdata;
unpack(pdata, buffer, position, comm);
data = DensityTable(pdata);
}
void unpack(ViscrefTable& data, std::vector<char>& buffer, int& position, void unpack(ViscrefTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@ -61,8 +61,6 @@ class Aqudims;
class Connection; class Connection;
class DeckItem; class DeckItem;
class DeckRecord; class DeckRecord;
class DENSITYRecord;
class DensityTable;
class Dimension; class Dimension;
class Events; class Events;
template<class T> class IOrderSet; template<class T> class IOrderSet;
@ -471,8 +469,6 @@ ADD_PACK_PROTOTYPES(Deck)
ADD_PACK_PROTOTYPES(DeckItem) ADD_PACK_PROTOTYPES(DeckItem)
ADD_PACK_PROTOTYPES(DeckKeyword) ADD_PACK_PROTOTYPES(DeckKeyword)
ADD_PACK_PROTOTYPES(DeckRecord) ADD_PACK_PROTOTYPES(DeckRecord)
ADD_PACK_PROTOTYPES(DENSITYRecord)
ADD_PACK_PROTOTYPES(DensityTable)
ADD_PACK_PROTOTYPES(Dimension) ADD_PACK_PROTOTYPES(Dimension)
ADD_PACK_PROTOTYPES(Events) ADD_PACK_PROTOTYPES(Events)
ADD_PACK_PROTOTYPES(GConSale) ADD_PACK_PROTOTYPES(GConSale)

4
tests/test_ParallelRestart.cpp
View File

@ -1082,7 +1082,7 @@ BOOST_AUTO_TEST_CASE(DENSITYRecord)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::DENSITYRecord val1{1.0, 2.0, 3.0}; Opm::DENSITYRecord val1{1.0, 2.0, 3.0};
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(DENSITYRecord) DO_CHECKS(DENSITYRecord)
#endif #endif
} }
@ -1092,7 +1092,7 @@ BOOST_AUTO_TEST_CASE(DensityTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::DensityTable val1({Opm::DENSITYRecord{1.0, 2.0, 3.0}}); Opm::DensityTable val1({Opm::DENSITYRecord{1.0, 2.0, 3.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(DensityTable) DO_CHECKS(DensityTable)
#endif #endif
} }