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 SolventDensityTable

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-17 10:07:46 +01:00
parent c409f7a084
commit 9002949707
3 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1087,12 +1087,6 @@ std::size_t packSize(const GuideRateConfig::GroupTarget& data,
packSize(data.target, comm); packSize(data.target, comm);
} }
std::size_t packSize(const SolventDensityTable& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getSolventDensityColumn(), comm);
}
std::size_t packSize(const PlyvmhTable& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const PlyvmhTable& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(static_cast<const std::vector<PlyvmhRecord>&>(data), comm); return packSize(static_cast<const std::vector<PlyvmhRecord>&>(data), comm);
@@ -2117,13 +2111,6 @@ void pack(const GuideRateConfig::GroupTarget& data,
pack(data.target, buffer, position, comm); pack(data.target, buffer, position, comm);
} }
void pack(const SolventDensityTable& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getSolventDensityColumn(), buffer, position, comm);
}
void pack(const PlyvmhTable& data, std::vector<char>& buffer, int& position, void pack(const PlyvmhTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@@ -3552,15 +3539,6 @@ void unpack(GuideRateConfig::GroupTarget& data,
unpack(data.target, buffer, position, comm); unpack(data.target, buffer, position, comm);
} }
void unpack(SolventDensityTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<double> tableValues;
unpack(tableValues, buffer, position, comm);
data = SolventDensityTable(tableValues);
}
void unpack(PlyvmhTable& data, std::vector<char>& buffer, int& position, void unpack(PlyvmhTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@@ -74,7 +74,6 @@ class RestartConfig;
class RestartSchedule; class RestartSchedule;
class RFTConfig; class RFTConfig;
class Segment; class Segment;
class SolventDensityTable;
class SpiralICD; class SpiralICD;
class StandardCond; class StandardCond;
class Tabdims; class Tabdims;
@@ -462,7 +461,6 @@ ADD_PACK_PROTOTYPES(RestartSchedule)
ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(RFTConfig) ADD_PACK_PROTOTYPES(RFTConfig)
ADD_PACK_PROTOTYPES(Segment) ADD_PACK_PROTOTYPES(Segment)
ADD_PACK_PROTOTYPES(SolventDensityTable)
ADD_PACK_PROTOTYPES(SpiralICD) ADD_PACK_PROTOTYPES(SpiralICD)
ADD_PACK_PROTOTYPES(std::string) ADD_PACK_PROTOTYPES(std::string)
ADD_PACK_PROTOTYPES(Tabdims) ADD_PACK_PROTOTYPES(Tabdims)

2
tests/test_ParallelRestart.cpp
View File

@@ -2351,7 +2351,7 @@ BOOST_AUTO_TEST_CASE(SolventDensityTable)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::SolventDensityTable val1({1.0, 2.0, 3.0}); Opm::SolventDensityTable val1({1.0, 2.0, 3.0});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(SolventDensityTable) DO_CHECKS(SolventDensityTable)
#endif #endif
} }