Skip to content
Snippets Groups Projects
Commit 2222b8ab authored by Spiros Tsalikis's avatar Spiros Tsalikis Committed by Kitware Robot
Browse files

Merge topic 'xdmf-ranks-error-message'


780a8baa XdmfValuesHDF: Print error when there is a ranks mismatch

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Acked-by: default avatarbuildbot <buildbot@kitware.com>
Reviewed-by: Cory Quammen's avatarCory Quammen <cory.quammen@kitware.com>
Merge-request: !11887
parents 993e8f34 780a8baa
No related branches found
No related tags found
No related merge requests found
......@@ -84,7 +84,7 @@ XdmfValuesHDF::Read(XdmfArray *anArray){
XdmfInt64 Start[ XDMF_MAX_DIMENSION ];
XdmfInt64 Stride[ XDMF_MAX_DIMENSION ];
XdmfInt64 Count[ XDMF_MAX_DIMENSION ];
// Select the HyperSlab from HDF5
Rank = this->DataDesc->GetHyperSlab( Start, Stride, Count );
H5.SelectHyperSlab( Start, Stride, Count );
......@@ -92,6 +92,14 @@ XdmfValuesHDF::Read(XdmfArray *anArray){
XdmfErrorMessage("Return Array No Large Enough to Hold Selected Data");
RetArray->SetShapeFromSelection(&H5);
}
if (Rank != H5.GetRank())
{
XdmfErrorMessage("Dataset has rank " << Rank << " with dimensions ["
<< this->DataDesc->GetShapeAsString() << "] but " << DataSetName
<<" array's selection has rank " << H5.GetRank() << " with dimensions ["
<< H5.GetShapeAsString() << "]");
// Error will be handled later, no need to do it here.
}
// RetArray->SetShape(Rank, Count);
// RetArray->SelectAll();
} else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment