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 UDQParams

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-13 12:49:27 +01:00
parent d7cfb92edc
commit 327ae5ce11
3 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,15 +542,6 @@ std::size_t packSize(const RestartConfig& data, Dune::MPIHelper::MPICommunicator
packSize(data.saveKeywords(), comm); packSize(data.saveKeywords(), comm);
} }
std::size_t packSize(const UDQParams& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.reseed(), comm) +
packSize(data.rand_seed(), comm) +
packSize(data.range(), comm) +
packSize(data.undefinedValue(), comm) +
packSize(data.cmpEpsilon(), comm);
}
std::size_t packSize(const PvtxTable& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const PvtxTable& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(data.getOuterColumnSchema(), comm) + return packSize(data.getOuterColumnSchema(), comm) +
@ -1815,16 +1806,6 @@ void pack(const RestartConfig& data, std::vector<char>& buffer, int& position,
pack(data.saveKeywords(), buffer, position, comm); pack(data.saveKeywords(), buffer, position, comm);
} }
void pack(const UDQParams& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.reseed(), buffer, position, comm);
pack(data.rand_seed(), buffer, position, comm);
pack(data.range(), buffer, position, comm);
pack(data.undefinedValue(), buffer, position, comm);
pack(data.cmpEpsilon(), buffer, position, comm);
}
void pack(const PvtxTable& data, std::vector<char>& buffer, int& position, void pack(const PvtxTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -3224,21 +3205,6 @@ void unpack(RestartConfig& data, std::vector<char>& buffer, int& position,
restart_keyw, save_keyw); restart_keyw, save_keyw);
} }
void unpack(UDQParams& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
bool reseed;
int rand_seed;
double range, undefVal, cmp_eps;
unpack(reseed, buffer, position, comm);
unpack(rand_seed, buffer, position, comm);
unpack(range, buffer, position, comm);
unpack(undefVal, buffer, position, comm);
unpack(cmp_eps, buffer, position, comm);
data = UDQParams(reseed, rand_seed, range, undefVal, cmp_eps);
}
template<class PVTType> template<class PVTType>
void unpack_pvt(PVTType& data, std::vector<char>& buffer, int& position, void unpack_pvt(PVTType& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)

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

@ -123,7 +123,6 @@ class TlmixparRecord;
class TlmixparTable; class TlmixparTable;
class Tuning; class Tuning;
class UDAValue; class UDAValue;
class UDQParams;
class UnitSystem; class UnitSystem;
class Valve; class Valve;
class VFPInjTable; class VFPInjTable;
@ -559,7 +558,6 @@ ADD_PACK_PROTOTYPES(TlmixparRecord)
ADD_PACK_PROTOTYPES(TlmixparTable) ADD_PACK_PROTOTYPES(TlmixparTable)
ADD_PACK_PROTOTYPES(Tuning) ADD_PACK_PROTOTYPES(Tuning)
ADD_PACK_PROTOTYPES(UDAValue) ADD_PACK_PROTOTYPES(UDAValue)
ADD_PACK_PROTOTYPES(UDQParams)
ADD_PACK_PROTOTYPES(UnitSystem) ADD_PACK_PROTOTYPES(UnitSystem)
ADD_PACK_PROTOTYPES(Valve) ADD_PACK_PROTOTYPES(Valve)
ADD_PACK_PROTOTYPES(VFPInjTable) ADD_PACK_PROTOTYPES(VFPInjTable)

2
tests/test_ParallelRestart.cpp
View File

@ -961,7 +961,7 @@ BOOST_AUTO_TEST_CASE(UDQParams)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::UDQParams val1(true, 1, 2.0, 3.0, 4.0); Opm::UDQParams val1(true, 1, 2.0, 3.0, 4.0);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(UDQParams) DO_CHECKS(UDQParams)
#endif #endif
} }