add mpi serialization for ViscrefTable

This commit is contained in:
Arne Morten Kvarving 2019-12-02 15:52:39 +01:00
parent b0d6e34799
commit c7d661bfc8
3 changed files with 32 additions and 0 deletions

View File

@ -466,6 +466,11 @@ std::size_t packSize(const DensityTable& data, Dune::MPIHelper::MPICommunicator
return packSize(static_cast<const std::vector<DENSITYRecord>&>(data), comm);
}
std::size_t packSize(const ViscrefTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const std::vector<VISCREFRecord>&>(data), comm);
}
////// pack routines
template<class T>
@ -917,6 +922,12 @@ void pack(const DensityTable& data, std::vector<char>& buffer, int& position,
pack(static_cast<const std::vector<DENSITYRecord>&>(data), buffer, position, comm);
}
void pack(const ViscrefTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(static_cast<const std::vector<VISCREFRecord>&>(data), buffer, position, comm);
}
/// unpack routines
template<class T>
@ -1485,6 +1496,14 @@ void unpack(DensityTable& data, std::vector<char>& buffer, int& position,
data = DensityTable(pdata);
}
void unpack(ViscrefTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<VISCREFRecord> pdata;
unpack(pdata, buffer, position, comm);
data = ViscrefTable(pdata);
}
} // end namespace Mpi
RestartValue loadParallelRestart(const EclipseIO* eclIO, SummaryState& summaryState,
const std::vector<Opm::RestartKey>& solutionKeys,

View File

@ -76,6 +76,7 @@ class TableSchema;
class ThresholdPressure;
class UDQParams;
class VISCREFRecord;
class ViscrefTable;
class Welldims;
class WellSegmentDims;
@ -302,6 +303,7 @@ ADD_PACK_PROTOTYPES(TimeMap)
ADD_PACK_PROTOTYPES(TimeMap::StepData)
ADD_PACK_PROTOTYPES(UDQParams)
ADD_PACK_PROTOTYPES(VISCREFRecord)
ADD_PACK_PROTOTYPES(ViscrefTable)
ADD_PACK_PROTOTYPES(Welldims)
ADD_PACK_PROTOTYPES(WellSegmentDims)

View File

@ -794,6 +794,17 @@ BOOST_AUTO_TEST_CASE(VISCREFRecord)
}
BOOST_AUTO_TEST_CASE(ViscrefTable)
{
#if HAVE_MPI
Opm::ViscrefTable val1({Opm::VISCREFRecord{1.0, 2.0}});
auto val2 = PackUnpack(val1);
BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2));
BOOST_CHECK(val1 == std::get<0>(val2));
#endif
}
bool init_unit_test_func()
{
return true;