From cf0b0aaf95bfa87ce1d105e18e97b44aefe5b385 Mon Sep 17 00:00:00 2001 From: Matt Larsen Date: Sat, 10 Mar 2018 09:08:29 -0800 Subject: [PATCH] fixing clipping and contour tree examples --- examples/clipping/Clipping.cxx | 2 ++ examples/contour_tree/ContourTreeMesh2D.cxx | 3 ++- examples/contour_tree/ContourTreeMesh3D.cxx | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/clipping/Clipping.cxx b/examples/clipping/Clipping.cxx index 7c4a4f665..80f7b9da7 100644 --- a/examples/clipping/Clipping.cxx +++ b/examples/clipping/Clipping.cxx @@ -93,10 +93,12 @@ int main(int argc, char* argv[]) vtkm::cont::Timer total; vtkm::cont::Timer 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(); diff --git a/examples/contour_tree/ContourTreeMesh2D.cxx b/examples/contour_tree/ContourTreeMesh2D.cxx index 14bb7c5cd..7e6e9e878 100644 --- a/examples/contour_tree/ContourTreeMesh2D.cxx +++ b/examples/contour_tree/ContourTreeMesh2D.cxx @@ -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> saddlePeak; diff --git a/examples/contour_tree/ContourTreeMesh3D.cxx b/examples/contour_tree/ContourTreeMesh3D.cxx index a6cc74018..1159dbb9c 100644 --- a/examples/contour_tree/ContourTreeMesh3D.cxx +++ b/examples/contour_tree/ContourTreeMesh3D.cxx @@ -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> saddlePeak;