OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-19 16:22:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

add mpi serialization of PvcdoTable

Browse Source
This commit is contained in:
Arne Morten Kvarving 2019-12-02 15:39:50 +01:00
parent 8f541db989
commit ba647bac5b
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -454,6 +454,11 @@ std::size_t packSize(const PvtwTable& data, Dune::MPIHelper::MPICommunicator com
return packSize(static_cast<const std::vector<PVTWRecord>&>(data), comm);
}
std::size_t packSize(const PvcdoTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const std::vector<PVCDORecord>&>(data), comm);
}
////// pack routines
template<class T>
@ -893,6 +898,12 @@ void pack(const PvtwTable& data, std::vector<char>& buffer, int& position,
pack(static_cast<const std::vector<PVTWRecord>&>(data), buffer, position, comm);
}
void pack(const PvcdoTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(static_cast<const std::vector<PVCDORecord>&>(data), buffer, position, comm);
}
/// unpack routines
template<class T>
@ -1445,6 +1456,14 @@ void unpack(PvtwTable& data, std::vector<char>& buffer, int& position,
data = PvtwTable(pdata);
}
void unpack(PvcdoTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<PVCDORecord> pdata;
unpack(pdata, buffer, position, comm);
data = PvcdoTable(pdata);
}
} // end namespace Mpi
RestartValue loadParallelRestart(const EclipseIO* eclIO, SummaryState& summaryState,
const std::vector<Opm::RestartKey>& solutionKeys,

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

@ -55,6 +55,7 @@ class NNC;
struct NNCdata;
class Phases;
class PVCDORecord;
class PvcdoTable;
class PvtgTable;
class PvtoTable;
class PVTWRecord;
@ -272,6 +273,7 @@ ADD_PACK_PROTOTYPES(NNC)
ADD_PACK_PROTOTYPES(NNCdata)
ADD_PACK_PROTOTYPES(Phases)
ADD_PACK_PROTOTYPES(PVCDORecord)
ADD_PACK_PROTOTYPES(PvcdoTable)
ADD_PACK_PROTOTYPES(PvtgTable)
ADD_PACK_PROTOTYPES(PvtoTable)
ADD_PACK_PROTOTYPES(PVTWRecord)

11
tests/test_ParallelRestart.cpp
View File

@ -750,6 +750,17 @@ BOOST_AUTO_TEST_CASE(PVCDORecord)
}
BOOST_AUTO_TEST_CASE(PvcdoTable)
{
#if HAVE_MPI
Opm::PvcdoTable val1({Opm::PVCDORecord{1.0, 2.0, 3.0, 4.0, 5.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;