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 mpi serialization support for EclHysterConfig

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-13 12:50:11 +01:00
parent 808b7cc7f4
commit a701c9267e
3 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1411,14 +1411,6 @@ std::size_t packSize(const TimeStampUTC& data,
packSize(data.microseconds(), comm);
}
std::size_t packSize(const EclHysterConfig& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.active(), comm) +
packSize(data.pcHysteresisModel(), comm) +
packSize(data.krHysteresisModel(), comm);
}
std::size_t packSize(const JFunc& data,
Dune::MPIHelper::MPICommunicator comm)
{
@ -2816,15 +2808,6 @@ void pack(const TimeStampUTC& data,
pack(data.microseconds(), buffer, position, comm);
}
void pack(const EclHysterConfig& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.active(), buffer, position, comm);
pack(data.pcHysteresisModel(), buffer, position, comm);
pack(data.krHysteresisModel(), buffer, position, comm);
}
void pack(const JFunc& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@ -4793,20 +4776,6 @@ void unpack(TimeStampUTC& data,
data = TimeStampUTC(ymd, hour, minutes, seconds, usec);
}
void unpack(EclHysterConfig& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
bool active;
int pcHysteresisModel, krHysteresisModel;
unpack(active, buffer, position, comm);
unpack(pcHysteresisModel, buffer, position, comm);
unpack(krHysteresisModel, buffer, position, comm);
data = EclHysterConfig(active, pcHysteresisModel, krHysteresisModel);
}
void unpack(JFunc& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)

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

@ -75,7 +75,6 @@ class DeckRecord;
class DENSITYRecord;
class DensityTable;
class Dimension;
class EclHysterConfig;
class Eqldims;
class Events;
template<class T> class IOrderSet;
@ -505,7 +504,6 @@ ADD_PACK_PROTOTYPES(DensityTable)
ADD_PACK_PROTOTYPES(DenT)
ADD_PACK_PROTOTYPES(DenT::entry)
ADD_PACK_PROTOTYPES(Dimension)
ADD_PACK_PROTOTYPES(EclHysterConfig)
ADD_PACK_PROTOTYPES(Eqldims)
ADD_PACK_PROTOTYPES(Events)
ADD_PACK_PROTOTYPES(GConSale)

2
tests/test_ParallelRestart.cpp
View File

@ -971,7 +971,7 @@ BOOST_AUTO_TEST_CASE(EclHysterConfig)
{
#if HAVE_MPI
Opm::EclHysterConfig val1(true, 1, 2);
auto val2 = PackUnpack(val1);
auto val2 = PackUnpack2(val1);
DO_CHECKS(EclHysterConfig)
#endif
}