An update will be applied December 9th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit c3b4507c authored by Sankhesh Jhaveri's avatar Sankhesh Jhaveri 💬
Browse files

FIX: Changes to remove vtk-4 compatibility

parent e330b535
...@@ -94,7 +94,7 @@ bool DoDataObjectsDiffer(vtkDataObject *dobj1, vtkDataObject *dobj2) ...@@ -94,7 +94,7 @@ bool DoDataObjectsDiffer(vtkDataObject *dobj1, vtkDataObject *dobj2)
cerr << "Number of field arrays test failed" << endl; cerr << "Number of field arrays test failed" << endl;
return true; return true;
} }
if (dobj1->GetEstimatedMemorySize()!=dobj2->GetEstimatedMemorySize()) if (dobj1->GetActualMemorySize()!=dobj2->GetActualMemorySize())
{ {
cerr << "Mem size test failed" << endl; cerr << "Mem size test failed" << endl;
return true; return true;
...@@ -156,7 +156,7 @@ bool TestXDMFConversion(vtkDataObject*input, char *prefix) ...@@ -156,7 +156,7 @@ bool TestXDMFConversion(vtkDataObject*input, char *prefix)
{ {
vtkDataSetWriter *dsw = vtkDataSetWriter::New(); vtkDataSetWriter *dsw = vtkDataSetWriter::New();
dsw->SetFileName(vtkfile); dsw->SetFileName(vtkfile);
dsw->SetInput(ds); dsw->SetInputData(ds);
dsw->Write(); dsw->Write();
dsw->Delete(); dsw->Delete();
} }
......
...@@ -1416,8 +1416,8 @@ vtkDataSet* vtkXdmfHeavyData::ExtractCells(XdmfSet* xmfSet, ...@@ -1416,8 +1416,8 @@ vtkDataSet* vtkXdmfHeavyData::ExtractCells(XdmfSet* xmfSet,
selNode->Delete(); selNode->Delete();
vtkExtractSelectedIds* extractCells = vtkExtractSelectedIds::New(); vtkExtractSelectedIds* extractCells = vtkExtractSelectedIds::New();
extractCells->SetInputConnection(0, dataSet->GetProducerPort()); extractCells->SetInputData(0, dataSet);
extractCells->SetInputConnection(1, sel->GetProducerPort()); extractCells->SetInputData(1, sel);
extractCells->Update(); extractCells->Update();
vtkDataSet* output = vtkDataSet::SafeDownCast( vtkDataSet* output = vtkDataSet::SafeDownCast(
......
...@@ -247,7 +247,7 @@ int vtkXdmfReader::RequestDataObject(vtkInformationVector *outputVector) ...@@ -247,7 +247,7 @@ int vtkXdmfReader::RequestDataObject(vtkInformationVector *outputVector)
if (!output || output->GetDataObjectType() != vtk_type) if (!output || output->GetDataObjectType() != vtk_type)
{ {
output = vtkDataObjectTypes::NewDataObject(vtk_type); output = vtkDataObjectTypes::NewDataObject(vtk_type);
output->SetPipelineInformation(outputVector->GetInformationObject(0)); outputVector->GetInformationObject(0)->Set(vtkDataObject::DATA_OBJECT(), output);
this->GetOutputPortInformation(0)->Set( this->GetOutputPortInformation(0)->Set(
vtkDataObject::DATA_EXTENT_TYPE(), output->GetExtentType()); vtkDataObject::DATA_EXTENT_TYPE(), output->GetExtentType());
output->Delete(); output->Delete();
......
...@@ -222,7 +222,7 @@ void vtkXdmfWriter::SetInput(vtkDataObject *input) ...@@ -222,7 +222,7 @@ void vtkXdmfWriter::SetInput(vtkDataObject *input)
{ {
if (input) if (input)
{ {
this->SetInputConnection(0, input->GetProducerPort()); this->SetInputDataInternal(0, input);
} }
else 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