Commit 47b9c04c authored by John Biddiscombe's avatar John Biddiscombe
Browse files

BUG:vtksys::ConvertToOutputPath was adding quotation marks around file paths...

BUG:vtksys::ConvertToOutputPath was adding quotation marks around file paths that have spaces. This broke some tests for xdmf Iron in pv3. Still need to fix a couple more tests.
parent 73ac8c70
......@@ -90,7 +90,7 @@
//----------------------------------------------------------------------------
vtkStandardNewMacro(vtkXdmfReader);
vtkCxxRevisionMacro(vtkXdmfReader, "1.37");
vtkCxxRevisionMacro(vtkXdmfReader, "1.38");
//----------------------------------------------------------------------------
vtkCxxSetObjectMacro(vtkXdmfReader,Controller,vtkMultiProcessController);
......@@ -1528,7 +1528,7 @@ int vtkXdmfReader::RequestDataObject(vtkInformationVector *outputVector)
{
directory = vtksys::SystemTools::GetCurrentWorkingDirectory() + "/";
}
directory = vtksys::SystemTools::ConvertToOutputPath(directory.c_str());
// directory = vtksys::SystemTools::ConvertToOutputPath(directory.c_str());
this->DOM->SetWorkingDirectory(directory.c_str());
// this->DOM->GlobalDebugOn();
......@@ -1558,8 +1558,7 @@ int vtkXdmfReader::RequestDataObject(vtkInformationVector *outputVector)
if (!this->UpdateDomains())
{
return 1;
}
this->UpdateRootGrid();
} this->UpdateRootGrid();
vtkDebugMacro("My output is a "
<< vtkDataObjectTypes::GetClassNameFromTypeId(
this->OutputVTKType) );
......@@ -1576,8 +1575,8 @@ int vtkXdmfReader::RequestDataObject(vtkInformationVector *outputVector)
output->Delete();
}
this->GetPointDataArraySelection()->RemoveAllArrays();
this->GetCellDataArraySelection()->RemoveAllArrays();
// this->GetPointDataArraySelection()->RemoveAllArrays();
// this->GetCellDataArraySelection()->RemoveAllArrays();
return 1;
}
......@@ -2734,7 +2733,10 @@ int vtkXdmfReaderInternal::RequestGridData(
vtkDebugWithObjectMacro(this->Reader,
"Preparing to Read :"
<< xdmfDOM->Get(dataNode, "CData"));
this->DataItem->Update();
if (this->DataItem->Update()==XDMF_FAIL)
{
vtkGenericWarningMacro(<<"Reading of HDF5 dataset failed");
}
values = this->DataItem->GetArray();
}
else
......
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