Commit fac1bef7 authored by allens's avatar allens
Browse files

change dim check to be equal to catch data and meshes that do not match

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16077 18c085ea-50e0-402c-830e-de6fd14e8384
parent d2c16b90
......@@ -21,8 +21,9 @@
VsH5Dataset::VsH5Dataset(VsRegistry* r, VsH5Object* parentObject, std::string datasetName, hid_t id):
VsH5Object(r, parentObject, datasetName, id){
dataType = H5Tget_native_type(H5Dget_type(id), H5T_DIR_DEFAULT);
loadDims();
registry->add(this);
......
......@@ -154,9 +154,11 @@ herr_t VsH5Reader::getDataSet( VsH5Dataset* dataSet,
return -1;
}
VsLog::debugLog() << __CLASS__ << __FUNCTION__ << " " << __LINE__ << " "
<< dataSet->getFullName() << " - Entering."
<< std::endl;
if (data == NULL) {
VsLog::debugLog() << __CLASS__ << __FUNCTION__ << " " << __LINE__ << " "
<< "Data storage is null?" << std::endl;
return -1;
}
herr_t err = 0;
......
......@@ -2476,10 +2476,10 @@ vtkDataArray* avtVsFileFormat::GetVar(int domain, const char* requestedName)
if( meshMetaPtr->isStructuredMesh() || meshMetaPtr->isUnstructuredMesh() )
numTopologicalDims -= 1;
if( varDims.size() - (int) isAComponent < numTopologicalDims )
if( varDims.size() - (int) isAComponent != numTopologicalDims )
{
VsLog::debugLog() << __CLASS__ << __FUNCTION__ << " " << __LINE__ << " "
<< "Var and mesh do not have the spatial dimension"
<< "Var and mesh do not have the topological dimension"
<< "Returning NULL." << std::endl;
return NULL;
}
......
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