OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3417 from blattms/fix-hdf5-dune-2.6

Browse Source 
Do not use FieldVector::data() mehod as it misses from DUNE 2.6.
This commit is contained in:
Arne Morten Kvarving 2023-03-15 21:10:34 +01:00 committed by GitHub
commit 6b71f3d3c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
opm/common/utility/Serializer.hpp
View File

@ -186,6 +186,25 @@ public:
}
protected:
/// Utility function for missing data() member function in FieldVector of DUNE 2.6
template<typename Vector>
const typename Vector::value_type* getVectorData(const Vector& data)
{
if (data.size() == 0)
return nullptr;
else
return &(data[0]);
}
/// Utility function for missing data() member function in FieldVector of DUNE 2.6
template<typename Vector>
typename Vector::value_type* getVectorData(Vector& data)
{
if (data.size() == 0)
return nullptr;
else
return &(data[0]);
}
//! \brief Handler for vectors.
//! \tparam T Type for vector elements
//! \param data The vector to (de-)serialize
@ -198,13 +217,13 @@ protected:
m_packSize += m_packer.packSize(data.data(), data.size());
} else if (m_op == Operation::PACK) {
(*this)(data.size());
m_packer.pack(data.data(), data.size(), m_buffer, m_position);
m_packer.pack(getVectorData(data), data.size(), m_buffer, m_position);
} else if (m_op == Operation::UNPACK) {
std::size_t size = 0;
(*this)(size);
auto& data_mut = const_cast<Vector&>(data);
data_mut.resize(size);
m_packer.unpack(data_mut.data(), size, m_buffer, m_position);
m_packer.unpack(getVectorData(data_mut), size, m_buffer, m_position);
}
} else {
if (m_op == Operation::UNPACK) {
@ -253,12 +272,12 @@ protected:
if constexpr (std::is_pod_v<T>) {
if (m_op == Operation::PACKSIZE)
m_packSize += m_packer.packSize(data.data(), data.size());
m_packSize += m_packer.packSize(getVectorData(data), data.size());
else if (m_op == Operation::PACK)
m_packer.pack(data.data(), data.size(), m_buffer, m_position);
m_packer.pack(getVectorData(data), data.size(), m_buffer, m_position);
else if (m_op == Operation::UNPACK) {
auto& data_mut = const_cast<Array&>(data);
m_packer.unpack(data_mut.data(), data_mut.size(), m_buffer, m_position);
m_packer.unpack(getVectorData(data_mut), data_mut.size(), m_buffer, m_position);
}
} else {
std::for_each(data.begin(), data.end(), std::ref(*this));