Commit 8c9438e2 authored by Michael Turner's avatar Michael Turner

Merge branch 'ticket/70-Fix-Hdf5-Homogeneous' into 'master'

Fix deadlock in Hdf5 with homogeneous expansions

Closes #70

See merge request !858
parents 0d1375c3 3608d367
......@@ -59,6 +59,7 @@ v4.4.2
**Library**
- Fix evaluation of points (e.g. HistoryPoints, Interpolation to pts) close to
the interface of two elements (!836)
- Fix deadlock in Hdf5 with homogeneous expansions (!858)
**NekMesh**
- Fix missing periodic boundary meshing and boundary layer mesh adjustment
......
......@@ -522,7 +522,7 @@ void FieldIOHdf5::v_Write(const std::string &outFile,
H5::DataSpaceSharedPtr homz_space = H5::DataSpace::OneD(nTotHomZ);
H5::DataSetSharedPtr homz_dset =
root->CreateDataSet("HOMOGENEOUSZIDS", homz_type, homz_space);
ASSERTL1(data_dset,
ASSERTL1(homz_dset,
prfx.str() + "cannot create HOMOGENEOUSZIDS dataset.");
}
......@@ -830,6 +830,27 @@ void FieldIOHdf5::v_Write(const std::string &outFile,
ids_dset->Write(
fielddefs[nFields - 1]->m_elementIDs, ids_fspace, writePL);
data_dset->Write(fielddata[nFields - 1], data_fspace, writePL);
if (order_dset)
{
order_dset->Write(numModesPerDirVar[nFields - 1],
order_fspace, writePL);
}
if (homy_dset)
{
homy_dset->Write(homoYIDs[nFields - 1], homy_fspace, writePL);
}
if (homz_dset)
{
homz_dset->Write(homoZIDs[nFields - 1], homz_fspace, writePL);
}
if (homs_dset)
{
homs_dset->Write(homoSIDs[nFields - 1], homs_fspace, writePL);
}
}
m_comm->Block();
......
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