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 PvtwsaltTable

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

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

@ -1087,14 +1087,6 @@ std::size_t packSize(const Action::Actions& data,
return packSize(data.getActions(), comm);
}
std::size_t packSize(const PvtwsaltTable& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getReferencePressureValue(), comm) +
packSize(data.getReferenceSaltConcentrationValue(), comm) +
packSize(data.getTableValues(), comm);
}
std::size_t packSize(const RestartSchedule& data,
Dune::MPIHelper::MPICommunicator comm)
{
@ -2177,15 +2169,6 @@ void pack(const Action::Actions& data,
pack(data.getActions(), buffer, position, comm);
}
void pack(const PvtwsaltTable& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getReferencePressureValue(), buffer, position, comm);
pack(data.getReferenceSaltConcentrationValue(), buffer, position, comm);
pack(data.getTableValues(), buffer, position, comm);
}
void pack(const RestartSchedule& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@ -3696,18 +3679,6 @@ void unpack(Action::Actions& data, std::vector<char>& buffer, int& position,
data = Action::Actions(actions);
}
void unpack(PvtwsaltTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
double refPressValue, refSaltConValue;
std::vector<double> tableValues;
unpack(refPressValue, buffer, position, comm);
unpack(refSaltConValue, buffer, position, comm);
unpack(tableValues, buffer, position, comm);
data = PvtwsaltTable(refPressValue, refSaltConValue, tableValues);
}
void unpack(RestartSchedule& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)

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

@ -72,7 +72,6 @@ class PlyvmhRecord;
class PlyvmhTable;
class PvtgTable;
class PvtoTable;
class PvtwsaltTable;
class Regdims;
class RestartConfig;
class RestartSchedule;
@ -467,7 +466,6 @@ ADD_PACK_PROTOTYPES(PlyvmhRecord)
ADD_PACK_PROTOTYPES(PlyvmhTable)
ADD_PACK_PROTOTYPES(PvtgTable)
ADD_PACK_PROTOTYPES(PvtoTable)
ADD_PACK_PROTOTYPES(PvtwsaltTable)
ADD_PACK_PROTOTYPES(Regdims)
ADD_PACK_PROTOTYPES(RestartConfig)
ADD_PACK_PROTOTYPES(RestartKey)

2
tests/test_ParallelRestart.cpp
View File

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