diff --git a/vtkm/filter/Streamline.h b/vtkm/filter/Streamline.h index b9bd6842a..282a793a1 100644 --- a/vtkm/filter/Streamline.h +++ b/vtkm/filter/Streamline.h @@ -79,9 +79,7 @@ class FilterTraits { public: struct TypeListTagStreamline - // This is causing some bizarre compiler errors. - // : vtkm::ListTagBase, vtkm::Vec> - : vtkm::ListTagBase> + : vtkm::ListTagBase, vtkm::Vec> { }; typedef TypeListTagStreamline InputFieldTypeList; diff --git a/vtkm/filter/Streamline.hxx b/vtkm/filter/Streamline.hxx index e1d3b41f3..83f660fe0 100644 --- a/vtkm/filter/Streamline.hxx +++ b/vtkm/filter/Streamline.hxx @@ -94,7 +94,10 @@ inline VTKM_CONT vtkm::filter::Result Streamline::DoExecute( vtkm::worklet::Streamline streamline; vtkm::worklet::StreamlineResult res; - res = Worklet.Run(rk4, this->Seeds, this->NumberOfSteps, device); + + vtkm::cont::ArrayHandle> seedArray; + vtkm::cont::DeviceAdapterAlgorithm::Copy(this->Seeds, seedArray); + res = Worklet.Run(rk4, seedArray, this->NumberOfSteps, device); vtkm::cont::DataSet outData; vtkm::cont::CoordinateSystem outputCoords("coordinates", res.positions);