add mpi serialization for DeckItem

This commit is contained in:
Arne Morten Kvarving
2020-01-02 15:30:48 +01:00
parent 55630acded
commit 13de64985a
3 changed files with 80 additions and 0 deletions
+60
View File
@@ -1459,6 +1459,21 @@ std::size_t packSize(const RFTConfig& data,
packSize(data.pltConfig(), comm);
}
std::size_t packSize(const DeckItem& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.dVal(), comm) +
packSize(data.iVal(), comm) +
packSize(data.sVal(), comm) +
packSize(data.uVal(), comm) +
packSize(data.getType(), comm) +
packSize(data.name(), comm) +
packSize(data.valueStatus(), comm) +
packSize(data.rawData(), comm) +
packSize(data.activeDimensions(), comm) +
packSize(data.defaultDimensions(), comm);
}
////// pack routines
template<class T>
@@ -2944,6 +2959,22 @@ void pack(const RFTConfig& data,
pack(data.pltConfig(), buffer, position, comm);
}
void pack(const DeckItem& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.dVal(), buffer, position, comm);
pack(data.iVal(), buffer, position, comm);
pack(data.sVal(), buffer, position, comm);
pack(data.uVal(), buffer, position, comm);
pack(data.getType(), buffer, position, comm);
pack(data.name(), buffer, position, comm);
pack(data.valueStatus(), buffer, position, comm);
pack(data.rawData(), buffer, position, comm);
pack(data.activeDimensions(), buffer, position, comm);
pack(data.defaultDimensions(), buffer, position, comm);
}
/// unpack routines
template<class T>
@@ -5027,6 +5058,35 @@ void unpack(RFTConfig& data,
wellOpen, rftConfig, pltConfig);
}
void unpack(DeckItem& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<double> dVal;
std::vector<int> iVal;
std::vector<std::string> sVal;
std::vector<UDAValue> uVal;
type_tag type;
std::string name;
std::vector<value::status> valueStatus;
bool rawData;
std::vector<Dimension> activeDimensions, defaultDimensions;
unpack(dVal, buffer, position, comm);
unpack(iVal, buffer, position, comm);
unpack(sVal, buffer, position, comm);
unpack(uVal, buffer, position, comm);
unpack(type, buffer, position, comm);
unpack(name, buffer, position, comm);
unpack(valueStatus, buffer, position, comm);
unpack(rawData, buffer, position, comm);
unpack(activeDimensions, buffer, position, comm);
unpack(defaultDimensions, buffer, position, comm);
data = DeckItem(dVal, iVal, sVal, uVal, type, name,
valueStatus, rawData, activeDimensions, defaultDimensions);
}
#define INSTANTIATE_PACK_VECTOR(T) \
template std::size_t packSize(const std::vector<T>& data, \
Dune::MPIHelper::MPICommunicator comm); \
+2
View File
@@ -66,6 +66,7 @@ class Actdims;
class Aqudims;
class ColumnSchema;
class Connection;
class DeckItem;
class DENSITYRecord;
class DensityTable;
class Dimension;
@@ -592,6 +593,7 @@ ADD_PACK_PROTOTYPES(data::Segment)
ADD_PACK_PROTOTYPES(data::Solution)
ADD_PACK_PROTOTYPES(data::Well)
ADD_PACK_PROTOTYPES(data::WellRates)
ADD_PACK_PROTOTYPES(DeckItem)
ADD_PACK_PROTOTYPES(DENSITYRecord)
ADD_PACK_PROTOTYPES(DensityTable)
ADD_PACK_PROTOTYPES(Dimension)