Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ken inspired fix for compiler errors.

Browse Source
This commit is contained in:
Dave Pugmire 2017-09-22 14:48:02 -04:00 committed by Dave Pugmire
parent 0a0ee460d3
commit 33e25c7aa9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/filter/Streamline.h
View File

@ -79,9 +79,7 @@ class FilterTraits<Streamline>
{ {
public: public:
struct TypeListTagStreamline struct TypeListTagStreamline
// This is causing some bizarre compiler errors. : vtkm::ListTagBase<vtkm::Vec<vtkm::Float32, 3>, vtkm::Vec<vtkm::Float64, 3>>
// : vtkm::ListTagBase<vtkm::Vec<vtkm::Float32,3>, vtkm::Vec<vtkm::Float64,3>>
: vtkm::ListTagBase<vtkm::Vec<vtkm::FloatDefault, 3>>
{ {
}; };
typedef TypeListTagStreamline InputFieldTypeList; typedef TypeListTagStreamline InputFieldTypeList;

5
vtkm/filter/Streamline.hxx
View File

@ -94,7 +94,10 @@ inline VTKM_CONT vtkm::filter::Result Streamline::DoExecute(
vtkm::worklet::Streamline streamline; vtkm::worklet::Streamline streamline;
vtkm::worklet::StreamlineResult<T> res; vtkm::worklet::StreamlineResult<T> res;
res = Worklet.Run(rk4, this->Seeds, this->NumberOfSteps, device);
vtkm::cont::ArrayHandle<vtkm::Vec<T, 3>> seedArray;
vtkm::cont::DeviceAdapterAlgorithm<DeviceAdapter>::Copy(this->Seeds, seedArray);
res = Worklet.Run(rk4, seedArray, this->NumberOfSteps, device);
vtkm::cont::DataSet outData; vtkm::cont::DataSet outData;
vtkm::cont::CoordinateSystem outputCoords("coordinates", res.positions); vtkm::cont::CoordinateSystem outputCoords("coordinates", res.positions);