Commit b90f149f authored by Sujin Philip's avatar Sujin Philip Committed by Sujin Philip
Browse files

Update VTK-m

parent 54e5bfb8
......@@ -392,16 +392,11 @@ vtkDataArray* Convert(const vtkm::cont::Field& input)
vtkPoints* Convert(const vtkm::cont::CoordinateSystem& input)
{
// We need to do the conversion from Field to a known vtkm::cont::ArrayHandle
// after that we need to fill the vtkDataArray
vtkmOutputFilterPolicy policy;
ArrayConverter aConverter;
vtkPoints* points = nullptr;
try
{
vtkm::cont::CastAndCall(vtkm::filter::ApplyPolicy(input, policy),
aConverter);
vtkm::cont::CastAndCall(input, aConverter);
vtkDataArray* pdata = aConverter.Data;
points = vtkPoints::New();
points->SetData(pdata);
......
......@@ -73,7 +73,7 @@ vtkm::cont::CoordinateSystem deduce_container(vtkPoints *points)
typedef vtkm::Vec<T, 3> Vec3;
Vec3 *xyz = nullptr;
return vtkm::cont::CoordinateSystem("coords", xyz, 0);
return vtkm::cont::make_CoordinateSystem("coords", xyz, 0);
}
}
//------------------------------------------------------------------------------
......@@ -95,7 +95,7 @@ vtkm::cont::CoordinateSystem Convert(vtkPoints *points)
// unsupported/null point set
typedef vtkm::Vec<vtkm::Float32, 3> Vec3;
Vec3 *xyz = nullptr;
return vtkm::cont::CoordinateSystem("coords", xyz, 0);
return vtkm::cont::make_CoordinateSystem("coords", xyz, 0);
}
//------------------------------------------------------------------------------
......
Subproject commit 0de08aae0692375e2a3510a59af352f8dfe8f02d
Subproject commit 6a908cc9da6076a42d41b9397ad71f56a1f69a70
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