From 08e6826017f73a30186ec62d52ea638d1ed4b9cd Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Thu, 17 Mar 2022 14:45:25 -0600 Subject: [PATCH] Remove deprecated use of old unscoped enums in FieldSelection --- benchmarking/BenchmarkFilters.cxx | 2 +- benchmarking/BenchmarkInSitu.cxx | 4 ++-- vtkm/filter/Filter.h | 4 ++-- vtkm/filter/Filter.hxx | 2 +- vtkm/filter/NewFilter.h | 6 +++--- vtkm/filter/contour/testing/UnitTestContourFilter.cxx | 4 ++-- vtkm/filter/entity_extraction/GhostCellRemove.cxx | 4 ++-- vtkm/filter/testing/UnitTestFieldSelection.cxx | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/benchmarking/BenchmarkFilters.cxx b/benchmarking/BenchmarkFilters.cxx index 41b3c2eff..f14b2ddb3 100644 --- a/benchmarking/BenchmarkFilters.cxx +++ b/benchmarking/BenchmarkFilters.cxx @@ -969,7 +969,7 @@ void InitDataSet(int& argc, char** argv) std::cerr << "[InitDataSet] Create UnstructuredInputDataSet from Tetrahedralized InputDataSet...\n"; vtkm::filter::geometry_refinement::Tetrahedralize tet; - tet.SetFieldsToPass(vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_ALL)); + tet.SetFieldsToPass(vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::Mode::All)); UnstructuredInputDataSet = tet.Execute(InputDataSet); if (tetra) diff --git a/benchmarking/BenchmarkInSitu.cxx b/benchmarking/BenchmarkInSitu.cxx index ef5c4ebd6..6118db06c 100644 --- a/benchmarking/BenchmarkInSitu.cxx +++ b/benchmarking/BenchmarkInSitu.cxx @@ -124,7 +124,7 @@ void BuildInputDataSet(uint32_t cycle, bool isStructured, bool isMultiBlock, vtk gradientFilter.SetComputePointGradient(true); gradientFilter.SetOutputFieldName(PointVectorsName); gradientFilter.SetFieldsToPass( - vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_ALL)); + vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::Mode::All)); if (isMultiBlock) { partitionedInputDataSet = gradientFilter.Execute(partitionedInputDataSet); @@ -139,7 +139,7 @@ void BuildInputDataSet(uint32_t cycle, bool isStructured, bool isMultiBlock, vtk { vtkm::filter::geometry_refinement::Tetrahedralize destructizer; destructizer.SetFieldsToPass( - vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_ALL)); + vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::Mode::All)); if (isMultiBlock) { partitionedInputDataSet = destructizer.Execute(partitionedInputDataSet); diff --git a/vtkm/filter/Filter.h b/vtkm/filter/Filter.h index 3318f6dc1..ba73498bd 100644 --- a/vtkm/filter/Filter.h +++ b/vtkm/filter/Filter.h @@ -261,7 +261,7 @@ public: VTKM_CONT void SetFieldsToPass(const vtkm::filter::FieldSelection& fieldsToPass, - vtkm::filter::FieldSelection::ModeEnum mode) + vtkm::filter::FieldSelection::Mode mode) { this->FieldsToPass = fieldsToPass; this->FieldsToPass.SetMode(mode); @@ -271,7 +271,7 @@ public: void SetFieldsToPass( const std::string& fieldname, vtkm::cont::Field::Association association, - vtkm::filter::FieldSelection::ModeEnum mode = vtkm::filter::FieldSelection::MODE_SELECT) + vtkm::filter::FieldSelection::Mode mode = vtkm::filter::FieldSelection::Mode::Select) { this->SetFieldsToPass({ fieldname, association }, mode); } diff --git a/vtkm/filter/Filter.hxx b/vtkm/filter/Filter.hxx index fe5229f78..d81cd7fb2 100644 --- a/vtkm/filter/Filter.hxx +++ b/vtkm/filter/Filter.hxx @@ -294,7 +294,7 @@ void CallPostExecute(Derived* self, template inline VTKM_CONT Filter::Filter() : Invoke() - , FieldsToPass(vtkm::filter::FieldSelection::MODE_ALL) + , FieldsToPass(vtkm::filter::FieldSelection::Mode::All) { } diff --git a/vtkm/filter/NewFilter.h b/vtkm/filter/NewFilter.h index d031af733..df597cb7f 100644 --- a/vtkm/filter/NewFilter.h +++ b/vtkm/filter/NewFilter.h @@ -260,7 +260,7 @@ public: VTKM_CONT void SetFieldsToPass(const vtkm::filter::FieldSelection& fieldsToPass, - vtkm::filter::FieldSelection::ModeEnum mode) + vtkm::filter::FieldSelection::Mode mode) { this->FieldsToPass = fieldsToPass; this->FieldsToPass.SetMode(mode); @@ -270,7 +270,7 @@ public: void SetFieldsToPass( const std::string& fieldname, vtkm::cont::Field::Association association, - vtkm::filter::FieldSelection::ModeEnum mode = vtkm::filter::FieldSelection::MODE_SELECT) + vtkm::filter::FieldSelection::Mode mode = vtkm::filter::FieldSelection::Mode::Select) { this->SetFieldsToPass({ fieldname, association }, mode); } @@ -438,7 +438,7 @@ private: } } - vtkm::filter::FieldSelection FieldsToPass = vtkm::filter::FieldSelection::MODE_ALL; + vtkm::filter::FieldSelection FieldsToPass = vtkm::filter::FieldSelection::Mode::All; bool RunFilterWithMultipleThreads = false; }; } diff --git a/vtkm/filter/contour/testing/UnitTestContourFilter.cxx b/vtkm/filter/contour/testing/UnitTestContourFilter.cxx index e6ac28532..d99445d68 100644 --- a/vtkm/filter/contour/testing/UnitTestContourFilter.cxx +++ b/vtkm/filter/contour/testing/UnitTestContourFilter.cxx @@ -43,7 +43,7 @@ public: mc.SetGenerateNormals(true); mc.SetIsoValue(0, 0.5); mc.SetActiveField("tangle"); - mc.SetFieldsToPass(vtkm::filter::FieldSelection::MODE_NONE); + mc.SetFieldsToPass(vtkm::filter::FieldSelection::Mode::None); auto result = mc.Execute(dataSet); { @@ -103,7 +103,7 @@ public: //we use FlyingEdges we now which does point merging for free //so we should see the number of points not change mc.SetMergeDuplicatePoints(false); - mc.SetFieldsToPass(vtkm::filter::FieldSelection::MODE_ALL); + mc.SetFieldsToPass(vtkm::filter::FieldSelection::Mode::All); result = mc.Execute(dataSet); { vtkm::cont::CoordinateSystem coords = result.GetCoordinateSystem(); diff --git a/vtkm/filter/entity_extraction/GhostCellRemove.cxx b/vtkm/filter/entity_extraction/GhostCellRemove.cxx index b5bb4f326..e6eadd9e3 100644 --- a/vtkm/filter/entity_extraction/GhostCellRemove.cxx +++ b/vtkm/filter/entity_extraction/GhostCellRemove.cxx @@ -309,7 +309,7 @@ namespace entity_extraction VTKM_CONT GhostCellRemove::GhostCellRemove() { this->SetActiveField("vtkmGhostCells"); - this->SetFieldsToPass("vtkmGhostCells", vtkm::filter::FieldSelection::MODE_EXCLUDE); + this->SetFieldsToPass("vtkmGhostCells", vtkm::filter::FieldSelection::Mode::Exclude); } //----------------------------------------------------------------------------- @@ -339,7 +339,7 @@ VTKM_CONT vtkm::cont::DataSet GhostCellRemove::DoExecute(const vtkm::cont::DataS extract.SetSampleRate(sample); if (this->GetRemoveGhostField()) extract.SetFieldsToPass(this->GetActiveFieldName(), - vtkm::filter::FieldSelection::MODE_EXCLUDE); + vtkm::filter::FieldSelection::Mode::Exclude); auto output = extract.Execute(input); return output; diff --git a/vtkm/filter/testing/UnitTestFieldSelection.cxx b/vtkm/filter/testing/UnitTestFieldSelection.cxx index cfbd4479c..e1bedb6e9 100644 --- a/vtkm/filter/testing/UnitTestFieldSelection.cxx +++ b/vtkm/filter/testing/UnitTestFieldSelection.cxx @@ -26,7 +26,7 @@ void TestFieldSelection() { std::cout << "field selection with select all, everything should be true." << std::endl; - vtkm::filter::FieldSelection selection(vtkm::filter::FieldSelection::MODE_ALL); + vtkm::filter::FieldSelection selection(vtkm::filter::FieldSelection::Mode::All); VTKM_TEST_ASSERT(selection.IsFieldSelected("foo") == true, "field selection failed."); VTKM_TEST_ASSERT(selection.IsFieldSelected("bar", vtkm::cont::Field::Association::Points) == true, @@ -35,7 +35,7 @@ void TestFieldSelection() { std::cout << "field selection with select none, everything should be false." << std::endl; - vtkm::filter::FieldSelection selection(vtkm::filter::FieldSelection::MODE_NONE); + vtkm::filter::FieldSelection selection(vtkm::filter::FieldSelection::Mode::None); VTKM_TEST_ASSERT(selection.IsFieldSelected("foo") == false, "field selection failed."); VTKM_TEST_ASSERT(selection.IsFieldSelected("bar", vtkm::cont::Field::Association::Points) == false, @@ -148,7 +148,7 @@ void TestFieldSelection() vtkm::filter::FieldSelection selection( { pair_type{ "foo", vtkm::cont::Field::Association::Any }, pair_type{ "bar", vtkm::cont::Field::Association::Cells } }, - vtkm::filter::FieldSelection::MODE_EXCLUDE); + vtkm::filter::FieldSelection::Mode::Exclude); VTKM_TEST_ASSERT(selection.IsFieldSelected("foo") == false, "field selection failed."); VTKM_TEST_ASSERT(selection.IsFieldSelected("foo", vtkm::cont::Field::Association::Points) == false,