Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-20 11:05:44 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'examples_filters_fix'

Browse Source 
cf0b0aaf fixing clipping and contour tree examples

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1111
This commit is contained in:
Matt Larsen 2018-03-10 23:19:09 +00:00 committed by Kitware Robot
commit 996b75b2fc
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/clipping/Clipping.cxx
View File

@ -93,10 +93,12 @@ int main(int argc, char* argv[])
vtkm::cont::Timer<DeviceAdapter> total;
vtkm::cont::Timer<DeviceAdapter> timer;
bool invertClip = false;
vtkm::cont::CellSetExplicit<> outputCellSet =
clip.Run(input.GetCellSet(0),
scalarField.GetData().ResetTypeList(vtkm::TypeListTagScalarAll()),
clipValue,
invertClip,
DeviceAdapter());
vtkm::Float64 clipTime = timer.GetElapsedTime();

3
examples/contour_tree/ContourTreeMesh2D.cxx
View File

@ -120,7 +120,8 @@ int main(int argc, char* argv[])
// Convert 2D mesh of values into contour tree, pairs of vertex ids
vtkm::filter::ContourTreeMesh2D filter;
result = filter.Execute(inDataSet, std::string("values"));
filter.SetActiveField("values");
result = filter.Execute(inDataSet);
vtkm::cont::Field resultField = result.GetField();
vtkm::cont::ArrayHandle<vtkm::Pair<vtkm::Id, vtkm::Id>> saddlePeak;

3
examples/contour_tree/ContourTreeMesh3D.cxx
View File

@ -121,7 +121,8 @@ int main(int argc, char* argv[])
// Convert 3D mesh of values into contour tree, pairs of vertex ids
vtkm::filter::ContourTreeMesh3D filter;
result = filter.Execute(inDataSet, std::string("values"));
filter.SetActiveField("values");
result = filter.Execute(inDataSet);
vtkm::cont::Field resultField = result.GetField();
vtkm::cont::ArrayHandle<vtkm::Pair<vtkm::Id, vtkm::Id>> saddlePeak;