Commit 4fcb775f authored by Spencer Sherwin's avatar Spencer Sherwin
Browse files

Merge branch 'fix/hdf5-deadlock' of 155.198.35.162:nektar/nektar into fix/hdf5-deadlock

parents 9c97616b 193cc3d2
......@@ -22,6 +22,7 @@ v4.4.1
- Remove the duplicate output of errorutil (!756)
- Fix BLAS CMake dependencies (!763)
- Fix interpolation issue with Lagrange basis functions (!768)
- Fix deadlock with HDF5 input (!786)
**FieldConvert**:
- Fix issue with FieldConvert when range flag used (!761)
......
......@@ -76,6 +76,7 @@ namespace H5
0); \
}
class Error : public std::exception
{
};
......@@ -474,12 +475,9 @@ public:
DataTypeSharedPtr mem_t = DataTypeTraits<T>::GetType();
DataSpaceSharedPtr memspace = DataSpace::OneD(data.size());
H5Dwrite(m_Id,
mem_t->GetId(),
memspace->GetId(),
filespace->GetId(),
dxpl->GetId(),
&data[0]);
H5_CALL(H5Dwrite,
(m_Id, mem_t->GetId(), memspace->GetId(), filespace->GetId(),
dxpl->GetId(), &data[0]) );
}
template <class T> void Read(std::vector<T> &data)
{
......@@ -508,12 +506,8 @@ public:
data.resize(len);
DataSpaceSharedPtr memspace = DataSpace::OneD(len);
H5Dread(m_Id,
mem_t->GetId(),
memspace->GetId(),
filespace->GetId(),
dxpl->GetId(),
&data[0]);
H5_CALL(H5Dread, (m_Id, mem_t->GetId(), memspace->GetId(),
filespace->GetId(), dxpl->GetId(), &data[0]));
}
private:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment