From fbe78b45cf17600a7a934c49866694c3f96516af Mon Sep 17 00:00:00 2001 From: Dave Pugmire Date: Mon, 29 Aug 2022 14:42:02 -0400 Subject: [PATCH] Change all usage of IsField* to Is*Field. --- tutorial/extract_edges.cxx | 4 ++-- vtkm/cont/Field.h | 3 +-- vtkm/filter/Lagrangian.hxx | 2 +- vtkm/filter/LagrangianStructures.hxx | 2 +- vtkm/filter/clean_grid/CleanGrid.cxx | 4 ++-- .../connected_components/ImageConnectivity.cxx | 2 +- vtkm/filter/contour/ClipWithField.cxx | 8 ++++---- vtkm/filter/contour/ClipWithImplicitFunction.cxx | 6 +++--- vtkm/filter/contour/Contour.cxx | 8 ++++---- vtkm/filter/contour/MIRFilter.cxx | 6 +++--- vtkm/filter/entity_extraction/ExternalFaces.cxx | 8 ++++---- vtkm/filter/entity_extraction/ExtractGeometry.cxx | 6 +++--- vtkm/filter/entity_extraction/ExtractPoints.cxx | 4 ++-- vtkm/filter/entity_extraction/ExtractStructured.cxx | 6 +++--- vtkm/filter/entity_extraction/GhostCellRemove.cxx | 6 +++--- vtkm/filter/entity_extraction/Mask.cxx | 4 ++-- vtkm/filter/entity_extraction/MaskPoints.cxx | 4 ++-- vtkm/filter/entity_extraction/Threshold.cxx | 4 ++-- vtkm/filter/entity_extraction/ThresholdPoints.cxx | 6 +++--- vtkm/filter/field_conversion/CellAverage.cxx | 2 +- vtkm/filter/field_conversion/PointAverage.cxx | 2 +- vtkm/filter/geometry_refinement/SplitSharpEdges.cxx | 4 ++-- vtkm/filter/geometry_refinement/Tetrahedralize.cxx | 6 +++--- vtkm/filter/geometry_refinement/Triangulate.cxx | 6 +++--- vtkm/filter/geometry_refinement/Tube.cxx | 6 +++--- vtkm/filter/geometry_refinement/VertexClustering.cxx | 6 +++--- vtkm/filter/image_processing/ComputeMoments.cxx | 2 +- vtkm/filter/image_processing/ImageDifference.cxx | 2 +- vtkm/filter/image_processing/ImageMedian.cxx | 2 +- vtkm/filter/mesh_info/CellMeasures.cxx | 2 +- vtkm/filter/mesh_info/MeshQualityArea.cxx | 2 +- vtkm/filter/mesh_info/MeshQualityVolume.cxx | 2 +- vtkm/filter/mesh_info/worklet/MeshQualityWorklet.h | 2 +- vtkm/filter/resampling/Probe.cxx | 6 +++--- vtkm/filter/scalar_topology/ContourTreeUniform.cxx | 4 ++-- .../scalar_topology/ContourTreeUniformAugmented.cxx | 2 +- .../ContourTreeUniformDistributed.cxx | 2 +- vtkm/filter/vector_analysis/Gradient.cxx | 2 +- vtkm/io/VTKDataSetWriter.cxx | 2 +- vtkm/io/testing/UnitTestVTKDataSetReader.cxx | 12 ++++++------ vtkm/rendering/MapperWireframer.cxx | 2 +- vtkm/rendering/Wireframer.h | 4 ++-- vtkm/rendering/raytracing/ConnectivityTracer.cxx | 4 ++-- vtkm/rendering/raytracing/CylinderIntersector.cxx | 2 +- vtkm/rendering/raytracing/GlyphIntersector.cxx | 2 +- vtkm/rendering/raytracing/GlyphIntersectorVector.cxx | 2 +- vtkm/rendering/raytracing/QuadIntersector.cxx | 4 ++-- vtkm/rendering/raytracing/SphereIntersector.cxx | 2 +- vtkm/rendering/raytracing/TriangleIntersector.cxx | 4 ++-- .../raytracing/VolumeRendererStructured.cxx | 4 ++-- 50 files changed, 99 insertions(+), 100 deletions(-) diff --git a/tutorial/extract_edges.cxx b/tutorial/extract_edges.cxx index e1bef6a5e..35915f237 100644 --- a/tutorial/extract_edges.cxx +++ b/tutorial/extract_edges.cxx @@ -127,11 +127,11 @@ VTKM_CONT bool DoMapField( { vtkm::cont::Field outputField; - if (inputField.IsFieldPoint()) + if (inputField.IsPointField()) { outputField = inputField; // pass through } - else if (inputField.IsFieldCell()) + else if (inputField.IsCellField()) { vtkm::cont::Field permuted; vtkm::filter::MapFieldPermutation(inputField, OutputToInputCellMap, permuted); diff --git a/vtkm/cont/Field.h b/vtkm/cont/Field.h index 1ebcf8e55..c9a99dbf3 100644 --- a/vtkm/cont/Field.h +++ b/vtkm/cont/Field.h @@ -40,7 +40,7 @@ public: Partitions, Global, ANY VTKM_DEPRECATED(1.8, "Use vtkm::cont::Field::Association::Any.") = Any, - WHOLE_MESH VTKM_DEPRECATED(1.8, "Use vtkm::cont::Field::Association::WholeMesh.") = + WHOLE_MESH VTKM_DEPRECATED(1.8, "Use vtkm::cont::Field::Association::WholeDataSet.") = WholeDataSet, POINTS VTKM_DEPRECATED(1.8, "Use vtkm::cont::Field::Association::Points.") = Points, CELL_SET VTKM_DEPRECATED(1.8, "Use vtkm::cont::Field::Association::Cells.") = Cells, @@ -78,7 +78,6 @@ public: } VTKM_CONT bool IsPartitionsField() const { - return this->FieldAssociation == Association::WholeMesh; return this->FieldAssociation == Association::Partitions; } VTKM_CONT bool IsGlobalField() const { return this->FieldAssociation == Association::Global; } diff --git a/vtkm/filter/Lagrangian.hxx b/vtkm/filter/Lagrangian.hxx index f0bd02539..1aeeb958c 100644 --- a/vtkm/filter/Lagrangian.hxx +++ b/vtkm/filter/Lagrangian.hxx @@ -333,7 +333,7 @@ inline VTKM_CONT bool Lagrangian::MapFieldOntoOutput(vtkm::cont::DataSet& result const vtkm::cont::Field& field, vtkm::filter::PolicyBase) { - if (field.IsFieldGlobal()) + if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/LagrangianStructures.hxx b/vtkm/filter/LagrangianStructures.hxx index 24f747392..9ac5d8759 100644 --- a/vtkm/filter/LagrangianStructures.hxx +++ b/vtkm/filter/LagrangianStructures.hxx @@ -176,7 +176,7 @@ inline VTKM_CONT bool LagrangianStructures::MapFieldOntoOutput( const vtkm::cont::Field& field, vtkm::filter::PolicyBase) { - if (field.IsFieldGlobal()) + if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/clean_grid/CleanGrid.cxx b/vtkm/filter/clean_grid/CleanGrid.cxx index 181e9a555..bf0a068dc 100644 --- a/vtkm/filter/clean_grid/CleanGrid.cxx +++ b/vtkm/filter/clean_grid/CleanGrid.cxx @@ -45,7 +45,7 @@ bool DoMapField(vtkm::cont::DataSet& result, const vtkm::filter::clean_grid::CleanGrid& self, vtkm::filter::clean_grid::SharedStates& worklets) { - if (field.IsFieldPoint() && (self.GetCompactPointFields() || self.GetMergePoints())) + if (field.IsPointField() && (self.GetCompactPointFields() || self.GetMergePoints())) { vtkm::cont::Field compactedField; if (self.GetCompactPointFields()) @@ -72,7 +72,7 @@ bool DoMapField(vtkm::cont::DataSet& result, return true; } } - else if (field.IsFieldCell() && self.GetRemoveDegenerateCells()) + else if (field.IsCellField() && self.GetRemoveDegenerateCells()) { return vtkm::filter::MapFieldPermutation( field, worklets.CellCompactor.GetValidCellIds(), result); diff --git a/vtkm/filter/connected_components/ImageConnectivity.cxx b/vtkm/filter/connected_components/ImageConnectivity.cxx index 3e9bd622b..a71b1e9ce 100644 --- a/vtkm/filter/connected_components/ImageConnectivity.cxx +++ b/vtkm/filter/connected_components/ImageConnectivity.cxx @@ -21,7 +21,7 @@ VTKM_CONT vtkm::cont::DataSet ImageConnectivity::DoExecute(const vtkm::cont::Dat { const auto& field = this->GetFieldFromDataSet(input); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorBadValue("Active field for ImageConnectivity must be a point field."); } diff --git a/vtkm/filter/contour/ClipWithField.cxx b/vtkm/filter/contour/ClipWithField.cxx index f3b4fbe8c..86381320e 100644 --- a/vtkm/filter/contour/ClipWithField.cxx +++ b/vtkm/filter/contour/ClipWithField.cxx @@ -41,7 +41,7 @@ bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, vtkm::worklet::Clip& worklet) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { auto resolve = [&](const auto& concrete) { // use std::decay to remove const ref from the decltype of concrete. @@ -56,13 +56,13 @@ bool DoMapField(vtkm::cont::DataSet& result, resolve); return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { // Use the precompiled field permutation function. vtkm::cont::ArrayHandle permutation = worklet.GetCellMapOutputToInput(); return vtkm::filter::MapFieldPermutation(field, permutation, result); } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; @@ -78,7 +78,7 @@ bool DoMapField(vtkm::cont::DataSet& result, vtkm::cont::DataSet ClipWithField::DoExecute(const vtkm::cont::DataSet& input) { const auto& field = this->GetFieldFromDataSet(input); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorFilterExecution("Point field expected."); } diff --git a/vtkm/filter/contour/ClipWithImplicitFunction.cxx b/vtkm/filter/contour/ClipWithImplicitFunction.cxx index c0a871d51..818cc29e8 100644 --- a/vtkm/filter/contour/ClipWithImplicitFunction.cxx +++ b/vtkm/filter/contour/ClipWithImplicitFunction.cxx @@ -41,7 +41,7 @@ bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, const vtkm::worklet::Clip& Worklet) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { auto resolve = [&](const auto& concrete) { // use std::decay to remove const ref from the decltype of concrete. @@ -56,13 +56,13 @@ bool DoMapField(vtkm::cont::DataSet& result, resolve); return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { // Use the precompiled field permutation function. vtkm::cont::ArrayHandle permutation = Worklet.GetCellMapOutputToInput(); return vtkm::filter::MapFieldPermutation(field, permutation, result); } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/contour/Contour.cxx b/vtkm/filter/contour/Contour.cxx index 270af7764..d16778bc9 100644 --- a/vtkm/filter/contour/Contour.cxx +++ b/vtkm/filter/contour/Contour.cxx @@ -43,7 +43,7 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, vtkm::worklet::Contour& worklet) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { auto functor = [&](const auto& concrete) { auto fieldArray = worklet.ProcessPointField(concrete); @@ -54,13 +54,13 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result, functor); return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { // Use the precompiled field permutation function. vtkm::cont::ArrayHandle permutation = worklet.GetCellIdMap(); return vtkm::filter::MapFieldPermutation(field, permutation, result); } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; @@ -93,7 +93,7 @@ vtkm::cont::DataSet Contour::DoExecute(const vtkm::cont::DataSet& inDataSet) vtkm::worklet::Contour worklet; worklet.SetMergeDuplicatePoints(this->GetMergeDuplicatePoints()); - if (!this->GetFieldFromDataSet(inDataSet).IsFieldPoint()) + if (!this->GetFieldFromDataSet(inDataSet).IsPointField()) { throw vtkm::cont::ErrorFilterExecution("Point field expected."); } diff --git a/vtkm/filter/contour/MIRFilter.cxx b/vtkm/filter/contour/MIRFilter.cxx index abc22e38d..dcac6fb44 100644 --- a/vtkm/filter/contour/MIRFilter.cxx +++ b/vtkm/filter/contour/MIRFilter.cxx @@ -53,7 +53,7 @@ VTKM_CONT bool MIRFilter::DoMapField( return false; } - if (field.IsFieldPoint()) + if (field.IsPointField()) { auto resolve = [&](const auto& concrete) { using T = typename std::decay_t::ValueType; @@ -67,7 +67,7 @@ VTKM_CONT bool MIRFilter::DoMapField( resolve); return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { return vtkm::filter::MapFieldPermutation(field, filterCellInterp, result); } @@ -117,7 +117,7 @@ VTKM_CONT vtkm::cont::DataSet MIRFilter::DoExecute(const vtkm::cont::DataSet& in vtkm::cont::Field or_len = input.GetField(this->len_name); vtkm::cont::Field or_ids = input.GetField(this->id_name); vtkm::cont::Field or_vfs = input.GetField(this->vf_name); - // TODO: Check all fields for 'IsFieldCell' + // TODO: Check all fields for 'IsCellField' vtkm::cont::ArrayHandle vfsdata_or, vfsdata; vtkm::cont::ArrayHandle idsdata_or, idsdata, lendata_or, lendata, posdata_or, posdata, allids; diff --git a/vtkm/filter/entity_extraction/ExternalFaces.cxx b/vtkm/filter/entity_extraction/ExternalFaces.cxx index 05e3b612e..d5711c6da 100644 --- a/vtkm/filter/entity_extraction/ExternalFaces.cxx +++ b/vtkm/filter/entity_extraction/ExternalFaces.cxx @@ -47,7 +47,7 @@ vtkm::cont::DataSet ExternalFaces::GenerateOutput(const vtkm::cont::DataSet& inp for (vtkm::Id fieldIdx = 0; fieldIdx < numFields && !hasCellFields; ++fieldIdx) { const auto& f = input.GetField(fieldIdx); - hasCellFields = f.IsFieldCell(); + hasCellFields = f.IsCellField(); } if (!hasCellFields) @@ -104,16 +104,16 @@ vtkm::cont::DataSet ExternalFaces::DoExecute(const vtkm::cont::DataSet& input) bool ExternalFaces::MapFieldOntoOutput(vtkm::cont::DataSet& result, const vtkm::cont::Field& field) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { result.AddField(field); return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { return vtkm::filter::MapFieldPermutation(field, this->Worklet->GetCellIdMap(), result); } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/entity_extraction/ExtractGeometry.cxx b/vtkm/filter/entity_extraction/ExtractGeometry.cxx index 89e000dc7..9361c115f 100644 --- a/vtkm/filter/entity_extraction/ExtractGeometry.cxx +++ b/vtkm/filter/entity_extraction/ExtractGeometry.cxx @@ -20,17 +20,17 @@ bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, const vtkm::worklet::ExtractGeometry& worklet) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { result.AddField(field); return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { vtkm::cont::ArrayHandle permutation = worklet.GetValidCellIds(); return vtkm::filter::MapFieldPermutation(field, permutation, result); } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/entity_extraction/ExtractPoints.cxx b/vtkm/filter/entity_extraction/ExtractPoints.cxx index 5344c34cb..4f0c95d50 100644 --- a/vtkm/filter/entity_extraction/ExtractPoints.cxx +++ b/vtkm/filter/entity_extraction/ExtractPoints.cxx @@ -17,12 +17,12 @@ namespace bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field) { // point data is copied as is because it was not collapsed - if (field.IsFieldPoint()) + if (field.IsPointField()) { result.AddField(field); return true; } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/entity_extraction/ExtractStructured.cxx b/vtkm/filter/entity_extraction/ExtractStructured.cxx index 9e7fd93f9..399ab9b3e 100644 --- a/vtkm/filter/entity_extraction/ExtractStructured.cxx +++ b/vtkm/filter/entity_extraction/ExtractStructured.cxx @@ -20,15 +20,15 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::ArrayHandle& CellFieldMap, const vtkm::cont::ArrayHandle& PointFieldMap) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { return vtkm::filter::MapFieldPermutation(field, PointFieldMap, result); } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { return vtkm::filter::MapFieldPermutation(field, CellFieldMap, result); } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/entity_extraction/GhostCellRemove.cxx b/vtkm/filter/entity_extraction/GhostCellRemove.cxx index d1ffd6dea..778626ded 100644 --- a/vtkm/filter/entity_extraction/GhostCellRemove.cxx +++ b/vtkm/filter/entity_extraction/GhostCellRemove.cxx @@ -277,17 +277,17 @@ bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, const vtkm::worklet::Threshold& worklet) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { //we copy the input handle to the result dataset, reusing the metadata result.AddField(field); return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { return vtkm::filter::MapFieldPermutation(field, worklet.GetValidCellIds(), result); } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/entity_extraction/Mask.cxx b/vtkm/filter/entity_extraction/Mask.cxx index f0a7f6c3b..44dc79b19 100644 --- a/vtkm/filter/entity_extraction/Mask.cxx +++ b/vtkm/filter/entity_extraction/Mask.cxx @@ -17,12 +17,12 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, const vtkm::worklet::Mask& worklet) { - if (field.IsFieldPoint() || field.IsFieldGlobal()) + if (field.IsPointField() || field.IsWholeDataSetField()) { result.AddField(field); // pass through return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { return vtkm::filter::MapFieldPermutation(field, worklet.GetValidCellIds(), result); } diff --git a/vtkm/filter/entity_extraction/MaskPoints.cxx b/vtkm/filter/entity_extraction/MaskPoints.cxx index a091362fe..564656f3e 100644 --- a/vtkm/filter/entity_extraction/MaskPoints.cxx +++ b/vtkm/filter/entity_extraction/MaskPoints.cxx @@ -17,12 +17,12 @@ namespace bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field) { // point data is copied as is because it was not collapsed - if (field.IsFieldPoint()) + if (field.IsPointField()) { result.AddField(field); return true; } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/entity_extraction/Threshold.cxx b/vtkm/filter/entity_extraction/Threshold.cxx index 2bc9f29b4..47e4aa34d 100644 --- a/vtkm/filter/entity_extraction/Threshold.cxx +++ b/vtkm/filter/entity_extraction/Threshold.cxx @@ -48,13 +48,13 @@ bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, const vtkm::worklet::Threshold& worklet) { - if (field.IsFieldPoint() || field.IsFieldGlobal()) + if (field.IsPointField() || field.IsWholeDataSetField()) { //we copy the input handle to the result dataset, reusing the metadata result.AddField(field); return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { return vtkm::filter::MapFieldPermutation(field, worklet.GetValidCellIds(), result); } diff --git a/vtkm/filter/entity_extraction/ThresholdPoints.cxx b/vtkm/filter/entity_extraction/ThresholdPoints.cxx index 455e43e98..173e4af3d 100644 --- a/vtkm/filter/entity_extraction/ThresholdPoints.cxx +++ b/vtkm/filter/entity_extraction/ThresholdPoints.cxx @@ -81,12 +81,12 @@ private: bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field) { // point data is copied as is because it was not collapsed - if (field.IsFieldPoint()) + if (field.IsPointField()) { result.AddField(field); return true; } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; @@ -138,7 +138,7 @@ VTKM_CONT vtkm::cont::DataSet ThresholdPoints::DoExecute(const vtkm::cont::DataS const auto& field = this->GetFieldFromDataSet(input); // field to threshold on must be a point field - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorFilterExecution("Point field expected."); } diff --git a/vtkm/filter/field_conversion/CellAverage.cxx b/vtkm/filter/field_conversion/CellAverage.cxx index c42377c5e..9459ed15d 100644 --- a/vtkm/filter/field_conversion/CellAverage.cxx +++ b/vtkm/filter/field_conversion/CellAverage.cxx @@ -22,7 +22,7 @@ namespace field_conversion vtkm::cont::DataSet CellAverage::DoExecute(const vtkm::cont::DataSet& input) { const auto& field = GetFieldFromDataSet(input); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorFilterExecution("Point field expected."); } diff --git a/vtkm/filter/field_conversion/PointAverage.cxx b/vtkm/filter/field_conversion/PointAverage.cxx index 1ad5f34e1..95628afe7 100644 --- a/vtkm/filter/field_conversion/PointAverage.cxx +++ b/vtkm/filter/field_conversion/PointAverage.cxx @@ -23,7 +23,7 @@ namespace field_conversion vtkm::cont::DataSet PointAverage::DoExecute(const vtkm::cont::DataSet& input) { const auto& field = GetFieldFromDataSet(input); - if (!field.IsFieldCell()) + if (!field.IsCellField()) { throw vtkm::cont::ErrorFilterExecution("Cell field expected."); } diff --git a/vtkm/filter/geometry_refinement/SplitSharpEdges.cxx b/vtkm/filter/geometry_refinement/SplitSharpEdges.cxx index 82c8145e3..dc27c06ba 100644 --- a/vtkm/filter/geometry_refinement/SplitSharpEdges.cxx +++ b/vtkm/filter/geometry_refinement/SplitSharpEdges.cxx @@ -24,11 +24,11 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, const vtkm::worklet::SplitSharpEdges& worklet) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { return vtkm::filter::MapFieldPermutation(field, worklet.GetNewPointsIdArray(), result); } - else if (field.IsFieldCell() || field.IsFieldGlobal()) + else if (field.IsCellField() || field.IsWholeDataSetField()) { result.AddField(field); // pass through return true; diff --git a/vtkm/filter/geometry_refinement/Tetrahedralize.cxx b/vtkm/filter/geometry_refinement/Tetrahedralize.cxx index 6c24f92f1..bec934e50 100644 --- a/vtkm/filter/geometry_refinement/Tetrahedralize.cxx +++ b/vtkm/filter/geometry_refinement/Tetrahedralize.cxx @@ -18,20 +18,20 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, const vtkm::worklet::Tetrahedralize& worklet) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { // point data is copied as is because it was not collapsed result.AddField(field); return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { // cell data must be scattered to the cells created per input cell vtkm::cont::ArrayHandle permutation = worklet.GetOutCellScatter().GetOutputToInputMap(); return vtkm::filter::MapFieldPermutation(field, permutation, result); } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/geometry_refinement/Triangulate.cxx b/vtkm/filter/geometry_refinement/Triangulate.cxx index 9f7a4fb28..e8eba2509 100644 --- a/vtkm/filter/geometry_refinement/Triangulate.cxx +++ b/vtkm/filter/geometry_refinement/Triangulate.cxx @@ -19,20 +19,20 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, const vtkm::worklet::Triangulate& worklet) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { // point data is copied as is because it was not collapsed result.AddField(field); return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { // cell data must be scattered to the cells created per input cell vtkm::cont::ArrayHandle permutation = worklet.GetOutCellScatter().GetOutputToInputMap(); return vtkm::filter::MapFieldPermutation(field, permutation, result); } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/geometry_refinement/Tube.cxx b/vtkm/filter/geometry_refinement/Tube.cxx index 2775ad0ac..9a93f777e 100644 --- a/vtkm/filter/geometry_refinement/Tube.cxx +++ b/vtkm/filter/geometry_refinement/Tube.cxx @@ -18,15 +18,15 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, const vtkm::worklet::Tube& worklet) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { return vtkm::filter::MapFieldPermutation(field, worklet.GetOutputPointSourceIndex(), result); } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { return vtkm::filter::MapFieldPermutation(field, worklet.GetOutputCellSourceIndex(), result); } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/geometry_refinement/VertexClustering.cxx b/vtkm/filter/geometry_refinement/VertexClustering.cxx index 946bfe4ae..cb751e7f1 100644 --- a/vtkm/filter/geometry_refinement/VertexClustering.cxx +++ b/vtkm/filter/geometry_refinement/VertexClustering.cxx @@ -19,15 +19,15 @@ VTKM_CONT bool DoMapField(vtkm::cont::DataSet& result, const vtkm::cont::Field& field, const vtkm::worklet::VertexClustering& worklet) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { return vtkm::filter::MapFieldPermutation(field, worklet.GetPointIdMap(), result); } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { return vtkm::filter::MapFieldPermutation(field, worklet.GetCellIdMap(), result); } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/image_processing/ComputeMoments.cxx b/vtkm/filter/image_processing/ComputeMoments.cxx index 8e2a4be8d..78499739c 100644 --- a/vtkm/filter/image_processing/ComputeMoments.cxx +++ b/vtkm/filter/image_processing/ComputeMoments.cxx @@ -42,7 +42,7 @@ VTKM_CONT ComputeMoments::ComputeMoments() VTKM_CONT vtkm::cont::DataSet ComputeMoments::DoExecute(const vtkm::cont::DataSet& input) { const auto& field = this->GetFieldFromDataSet(input); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorBadValue("Active field for ComputeMoments must be a point field."); } diff --git a/vtkm/filter/image_processing/ImageDifference.cxx b/vtkm/filter/image_processing/ImageDifference.cxx index ebfacd00b..73a9b8f55 100644 --- a/vtkm/filter/image_processing/ImageDifference.cxx +++ b/vtkm/filter/image_processing/ImageDifference.cxx @@ -49,7 +49,7 @@ VTKM_CONT vtkm::cont::DataSet ImageDifference::DoExecute(const vtkm::cont::DataS this->ImageDiffWithinThreshold = true; const auto& primaryField = this->GetFieldFromDataSet(input); - if (!primaryField.IsFieldPoint()) + if (!primaryField.IsPointField()) { throw vtkm::cont::ErrorFilterExecution("Point field expected."); } diff --git a/vtkm/filter/image_processing/ImageMedian.cxx b/vtkm/filter/image_processing/ImageMedian.cxx index 993e6cd8c..5efebcc5f 100644 --- a/vtkm/filter/image_processing/ImageMedian.cxx +++ b/vtkm/filter/image_processing/ImageMedian.cxx @@ -90,7 +90,7 @@ namespace image_processing VTKM_CONT vtkm::cont::DataSet ImageMedian::DoExecute(const vtkm::cont::DataSet& input) { const auto& field = this->GetFieldFromDataSet(input); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorBadValue("Active field for ImageMedian must be a point field."); } diff --git a/vtkm/filter/mesh_info/CellMeasures.cxx b/vtkm/filter/mesh_info/CellMeasures.cxx index f29fd498c..c16bd10f0 100644 --- a/vtkm/filter/mesh_info/CellMeasures.cxx +++ b/vtkm/filter/mesh_info/CellMeasures.cxx @@ -31,7 +31,7 @@ VTKM_CONT CellMeasures::CellMeasures(IntegrationType m) VTKM_CONT vtkm::cont::DataSet CellMeasures::DoExecute(const vtkm::cont::DataSet& input) { const auto& field = this->GetFieldFromDataSet(input); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorFilterExecution("CellMeasures expects point field input."); } diff --git a/vtkm/filter/mesh_info/MeshQualityArea.cxx b/vtkm/filter/mesh_info/MeshQualityArea.cxx index 48530f324..083a7aee1 100644 --- a/vtkm/filter/mesh_info/MeshQualityArea.cxx +++ b/vtkm/filter/mesh_info/MeshQualityArea.cxx @@ -143,7 +143,7 @@ vtkm::Float64 MeshQualityArea::ComputeAverageArea(const vtkm::cont::DataSet& inp vtkm::cont::DataSet MeshQualityArea::DoExecute(const vtkm::cont::DataSet& input) { const auto& field = this->GetFieldFromDataSet(input); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorBadValue("Active field for MeshQuality must be point coordinates. " "But the active field is not a point field."); diff --git a/vtkm/filter/mesh_info/MeshQualityVolume.cxx b/vtkm/filter/mesh_info/MeshQualityVolume.cxx index 332f689f8..223774312 100644 --- a/vtkm/filter/mesh_info/MeshQualityVolume.cxx +++ b/vtkm/filter/mesh_info/MeshQualityVolume.cxx @@ -132,7 +132,7 @@ vtkm::Float64 MeshQualityVolume::ComputeAverageVolume(const vtkm::cont::DataSet& vtkm::cont::DataSet MeshQualityVolume::DoExecute(const vtkm::cont::DataSet& input) { const auto& field = this->GetFieldFromDataSet(input); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorBadValue("Active field for MeshQuality must be point coordinates. " "But the active field is not a point field."); diff --git a/vtkm/filter/mesh_info/worklet/MeshQualityWorklet.h b/vtkm/filter/mesh_info/worklet/MeshQualityWorklet.h index 1b40fa993..610f25eb9 100644 --- a/vtkm/filter/mesh_info/worklet/MeshQualityWorklet.h +++ b/vtkm/filter/mesh_info/worklet/MeshQualityWorklet.h @@ -82,7 +82,7 @@ struct MeshQualityWorklet : vtkm::worklet::WorkletVisitCellsWithPoints VTKM_CONT vtkm::cont::UnknownArrayHandle Run(const vtkm::cont::DataSet& input, const vtkm::cont::Field& field) const { - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorBadValue("Active field for MeshQuality must be point coordinates. " "But the active field is not a point field."); diff --git a/vtkm/filter/resampling/Probe.cxx b/vtkm/filter/resampling/Probe.cxx index 7ede251c4..3a59ef899 100644 --- a/vtkm/filter/resampling/Probe.cxx +++ b/vtkm/filter/resampling/Probe.cxx @@ -28,7 +28,7 @@ bool DoMapField(vtkm::cont::DataSet& result, const vtkm::worklet::Probe& worklet, vtkm::Float64 invalidValue) { - if (field.IsFieldPoint()) + if (field.IsPointField()) { auto resolve = [&](const auto& concrete) { using T = typename std::decay_t::ValueType; @@ -41,7 +41,7 @@ bool DoMapField(vtkm::cont::DataSet& result, resolve); return true; } - else if (field.IsFieldCell()) + else if (field.IsCellField()) { vtkm::cont::Field outField; if (vtkm::filter::MapFieldPermutation(field, worklet.GetCellIds(), outField, invalidValue)) @@ -54,7 +54,7 @@ bool DoMapField(vtkm::cont::DataSet& result, } return false; } - else if (field.IsFieldGlobal()) + else if (field.IsWholeDataSetField()) { result.AddField(field); return true; diff --git a/vtkm/filter/scalar_topology/ContourTreeUniform.cxx b/vtkm/filter/scalar_topology/ContourTreeUniform.cxx index e24bb8630..e90290c32 100644 --- a/vtkm/filter/scalar_topology/ContourTreeUniform.cxx +++ b/vtkm/filter/scalar_topology/ContourTreeUniform.cxx @@ -74,7 +74,7 @@ ContourTreeMesh2D::ContourTreeMesh2D() vtkm::cont::DataSet ContourTreeMesh2D::DoExecute(const vtkm::cont::DataSet& input) { const auto& field = this->GetFieldFromDataSet(input); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorFilterExecution("ContourTreeMesh2D expects point field input."); } @@ -109,7 +109,7 @@ ContourTreeMesh3D::ContourTreeMesh3D() vtkm::cont::DataSet ContourTreeMesh3D::DoExecute(const vtkm::cont::DataSet& input) { const auto& field = this->GetFieldFromDataSet(input); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorFilterExecution("Point field expected."); } diff --git a/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.cxx b/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.cxx index cea1477a4..ac145b9af 100644 --- a/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.cxx +++ b/vtkm/filter/scalar_topology/ContourTreeUniformAugmented.cxx @@ -121,7 +121,7 @@ vtkm::cont::DataSet ContourTreeAugmented::DoExecute(const vtkm::cont::DataSet& i // Check that the field is Ok const auto& field = this->GetFieldFromDataSet(input); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorFilterExecution("Point field expected."); } diff --git a/vtkm/filter/scalar_topology/ContourTreeUniformDistributed.cxx b/vtkm/filter/scalar_topology/ContourTreeUniformDistributed.cxx index 5c58a6cc8..a4de37b00 100644 --- a/vtkm/filter/scalar_topology/ContourTreeUniformDistributed.cxx +++ b/vtkm/filter/scalar_topology/ContourTreeUniformDistributed.cxx @@ -531,7 +531,7 @@ vtkm::cont::PartitionedDataSet ContourTreeUniformDistributed::DoExecutePartition const auto& dataset = input.GetPartition(blockNo); const auto& field = dataset.GetField(this->GetActiveFieldName(), this->GetActiveFieldAssociation()); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorFilterExecution("Point field expected."); } diff --git a/vtkm/filter/vector_analysis/Gradient.cxx b/vtkm/filter/vector_analysis/Gradient.cxx index 4945081ea..aa7b314e8 100644 --- a/vtkm/filter/vector_analysis/Gradient.cxx +++ b/vtkm/filter/vector_analysis/Gradient.cxx @@ -40,7 +40,7 @@ namespace vector_analysis vtkm::cont::DataSet Gradient::DoExecute(const vtkm::cont::DataSet& inputDataSet) { const auto& field = this->GetFieldFromDataSet(inputDataSet); - if (!field.IsFieldPoint()) + if (!field.IsPointField()) { throw vtkm::cont::ErrorFilterExecution("Point field expected."); } diff --git a/vtkm/io/VTKDataSetWriter.cxx b/vtkm/io/VTKDataSetWriter.cxx index 0e0dee62e..78650e6ee 100644 --- a/vtkm/io/VTKDataSetWriter.cxx +++ b/vtkm/io/VTKDataSetWriter.cxx @@ -353,7 +353,7 @@ void WriteCellFields(std::ostream& out, for (vtkm::Id f = 0; f < dataSet.GetNumberOfFields(); f++) { const vtkm::cont::Field field = dataSet.GetField(f); - if (!field.IsFieldCell()) + if (!field.IsCellField()) { continue; } diff --git a/vtkm/io/testing/UnitTestVTKDataSetReader.cxx b/vtkm/io/testing/UnitTestVTKDataSetReader.cxx index b4443213b..f3acc02df 100644 --- a/vtkm/io/testing/UnitTestVTKDataSetReader.cxx +++ b/vtkm/io/testing/UnitTestVTKDataSetReader.cxx @@ -395,7 +395,7 @@ void TestReadingFishTank() // And if we open the file in Paraview, we can observe the bounds [0, 156.905]. const vtkm::cont::Field& vec_magnitude = ds.GetField("vec_magnitude"); VTKM_TEST_ASSERT(vec_magnitude.GetName() == "vec_magnitude"); - VTKM_TEST_ASSERT(vec_magnitude.IsFieldPoint()); + VTKM_TEST_ASSERT(vec_magnitude.IsPointField()); vtkm::Range mag_range; vec_magnitude.GetRange(&mag_range); @@ -405,7 +405,7 @@ void TestReadingFishTank() // This info was gleaned from the Paraview Information panel: const vtkm::cont::Field& vec = ds.GetField("vec"); VTKM_TEST_ASSERT(vec.GetName() == "vec"); - VTKM_TEST_ASSERT(vec.IsFieldPoint()); + VTKM_TEST_ASSERT(vec.IsPointField()); // Bounds from Information panel: // [-65.3147, 86.267], [-88.0325, 78.7217], [-67.0969, 156.867] const vtkm::cont::ArrayHandle& vecRanges = vec.GetRange(); @@ -460,7 +460,7 @@ void TestReadingDoublePrecisionFishTank() // This info was gleaned from the Paraview Information panel: const vtkm::cont::Field& vec = ds.GetField("vec"); VTKM_TEST_ASSERT(vec.GetName() == "vec"); - VTKM_TEST_ASSERT(vec.IsFieldPoint()); + VTKM_TEST_ASSERT(vec.IsPointField()); // Bounds from Information panel: // [-65.3147, 86.267], [-88.0325, 78.7217], [-67.0969, 156.867] const vtkm::cont::ArrayHandle& vecRanges = vec.GetRange(); @@ -508,7 +508,7 @@ void TestReadingASCIIFishTank() const vtkm::cont::Field& vec = ds.GetField("vec"); VTKM_TEST_ASSERT(vec.GetName() == "vec"); - VTKM_TEST_ASSERT(vec.IsFieldPoint()); + VTKM_TEST_ASSERT(vec.IsPointField()); // Bounds from Paraview information panel: // [-65.3147, 86.267], [-88.0325, 78.7217], [-67.0969, 156.867] const vtkm::cont::ArrayHandle& vecRanges = vec.GetRange(); @@ -561,7 +561,7 @@ void TestReadingFusion() // vec_magnitude [0, 3.73778] vtkm::cont::Field vec_magnitude = ds.GetField("vec_magnitude"); VTKM_TEST_ASSERT(vec_magnitude.GetName() == "vec_magnitude"); - VTKM_TEST_ASSERT(vec_magnitude.IsFieldPoint()); + VTKM_TEST_ASSERT(vec_magnitude.IsPointField()); vtkm::Range mag_range; vec_magnitude.GetRange(&mag_range); @@ -571,7 +571,7 @@ void TestReadingFusion() vtkm::cont::Field vec = ds.GetField("vec"); VTKM_TEST_ASSERT(vec.GetName() == "vec"); - VTKM_TEST_ASSERT(vec.IsFieldPoint()); + VTKM_TEST_ASSERT(vec.IsPointField()); const vtkm::cont::ArrayHandle& vecRanges = vec.GetRange(); VTKM_TEST_ASSERT(vecRanges.GetNumberOfValues() == 3); auto vecRangesReadPortal = vecRanges.ReadPortal(); diff --git a/vtkm/rendering/MapperWireframer.cxx b/vtkm/rendering/MapperWireframer.cxx index 8e46444e8..9f79c3913 100644 --- a/vtkm/rendering/MapperWireframer.cxx +++ b/vtkm/rendering/MapperWireframer.cxx @@ -245,7 +245,7 @@ void MapperWireframer::RenderCells(const vtkm::cont::UnknownCellSet& inCellSet, if (is1D) { - const bool isSupportedField = inScalarField.IsFieldPoint(); + const bool isSupportedField = inScalarField.IsPointField(); if (!isSupportedField) { throw vtkm::cont::ErrorBadValue( diff --git a/vtkm/rendering/Wireframer.h b/vtkm/rendering/Wireframer.h index 85636e417..44a633a36 100644 --- a/vtkm/rendering/Wireframer.h +++ b/vtkm/rendering/Wireframer.h @@ -529,12 +529,12 @@ private: xOffset = static_cast(_x); } - const bool isSupportedField = ScalarField.IsFieldCell() || ScalarField.IsFieldPoint(); + const bool isSupportedField = ScalarField.IsCellField() || ScalarField.IsPointField(); if (!isSupportedField) { throw vtkm::cont::ErrorBadValue("Field not associated with cell set or points"); } - const bool isAssocPoints = ScalarField.IsFieldPoint(); + const bool isAssocPoints = ScalarField.IsPointField(); { vtkm::cont::Token token; diff --git a/vtkm/rendering/raytracing/ConnectivityTracer.cxx b/vtkm/rendering/raytracing/ConnectivityTracer.cxx index 23b8f7514..17d61e007 100644 --- a/vtkm/rendering/raytracing/ConnectivityTracer.cxx +++ b/vtkm/rendering/raytracing/ConnectivityTracer.cxx @@ -205,12 +205,12 @@ void ConnectivityTracer::SetVolumeData(const vtkm::cont::Field& scalarField, Coords = coords; MeshConnIsConstructed = false; - const bool isSupportedField = ScalarField.IsFieldCell() || ScalarField.IsFieldPoint(); + const bool isSupportedField = ScalarField.IsCellField() || ScalarField.IsPointField(); if (!isSupportedField) { throw vtkm::cont::ErrorBadValue("Field not accociated with cell set or points"); } - FieldAssocPoints = ScalarField.IsFieldPoint(); + FieldAssocPoints = ScalarField.IsPointField(); this->Integrator = Volume; diff --git a/vtkm/rendering/raytracing/CylinderIntersector.cxx b/vtkm/rendering/raytracing/CylinderIntersector.cxx index c3f74b742..2b8df6d75 100644 --- a/vtkm/rendering/raytracing/CylinderIntersector.cxx +++ b/vtkm/rendering/raytracing/CylinderIntersector.cxx @@ -476,7 +476,7 @@ void CylinderIntersector::IntersectionDataImp(Ray& rays, ShapeIntersector::IntersectionPoint(rays); // TODO: if this is nodes of a mesh, support points - const bool isSupportedField = scalarField.IsFieldCell() || scalarField.IsFieldPoint(); + const bool isSupportedField = scalarField.IsCellField() || scalarField.IsPointField(); if (!isSupportedField) { throw vtkm::cont::ErrorBadValue("Field not accociated with a cell set"); diff --git a/vtkm/rendering/raytracing/GlyphIntersector.cxx b/vtkm/rendering/raytracing/GlyphIntersector.cxx index f0545e98d..b097d82ec 100644 --- a/vtkm/rendering/raytracing/GlyphIntersector.cxx +++ b/vtkm/rendering/raytracing/GlyphIntersector.cxx @@ -587,7 +587,7 @@ void GlyphIntersector::IntersectionDataImp(Ray& rays, { ShapeIntersector::IntersectionPoint(rays); - const bool isSupportedField = scalarField.IsFieldCell() || scalarField.IsFieldPoint(); + const bool isSupportedField = scalarField.IsCellField() || scalarField.IsPointField(); if (!isSupportedField) { throw vtkm::cont::ErrorBadValue( diff --git a/vtkm/rendering/raytracing/GlyphIntersectorVector.cxx b/vtkm/rendering/raytracing/GlyphIntersectorVector.cxx index 38f94b421..65290872e 100644 --- a/vtkm/rendering/raytracing/GlyphIntersectorVector.cxx +++ b/vtkm/rendering/raytracing/GlyphIntersectorVector.cxx @@ -664,7 +664,7 @@ void GlyphIntersectorVector::IntersectionDataImp(Ray& rays, { ShapeIntersector::IntersectionPoint(rays); - const bool isSupportedField = field.IsFieldCell() || field.IsFieldPoint(); + const bool isSupportedField = field.IsCellField() || field.IsPointField(); if (!isSupportedField) { throw vtkm::cont::ErrorBadValue( diff --git a/vtkm/rendering/raytracing/QuadIntersector.cxx b/vtkm/rendering/raytracing/QuadIntersector.cxx index eeea11b3f..51fa4c5ba 100644 --- a/vtkm/rendering/raytracing/QuadIntersector.cxx +++ b/vtkm/rendering/raytracing/QuadIntersector.cxx @@ -501,7 +501,7 @@ void QuadIntersector::IntersectionDataImp(Ray& rays, ShapeIntersector::IntersectionPoint(rays); // TODO: if this is nodes of a mesh, support points - const bool isSupportedField = scalarField.IsFieldCell() || scalarField.IsFieldPoint(); + const bool isSupportedField = scalarField.IsCellField() || scalarField.IsPointField(); if (!isSupportedField) { throw vtkm::cont::ErrorBadValue("Field not accociated with a cell set"); @@ -510,7 +510,7 @@ void QuadIntersector::IntersectionDataImp(Ray& rays, vtkm::worklet::DispatcherMapField(detail::CalculateNormals()) .Invoke(rays.HitIdx, rays.Dir, rays.NormalX, rays.NormalY, rays.NormalZ, CoordsHandle, QuadIds); - if (scalarField.IsFieldPoint()) + if (scalarField.IsPointField()) { vtkm::worklet::DispatcherMapField>( detail::GetLerpedScalar(vtkm::Float32(scalarRange.Min), diff --git a/vtkm/rendering/raytracing/SphereIntersector.cxx b/vtkm/rendering/raytracing/SphereIntersector.cxx index a1dfb8d01..cb3f18684 100644 --- a/vtkm/rendering/raytracing/SphereIntersector.cxx +++ b/vtkm/rendering/raytracing/SphereIntersector.cxx @@ -351,7 +351,7 @@ void SphereIntersector::IntersectionDataImp(Ray& rays, { ShapeIntersector::IntersectionPoint(rays); - const bool isSupportedField = scalarField.IsFieldCell() || scalarField.IsFieldPoint(); + const bool isSupportedField = scalarField.IsCellField() || scalarField.IsPointField(); if (!isSupportedField) { throw vtkm::cont::ErrorBadValue( diff --git a/vtkm/rendering/raytracing/TriangleIntersector.cxx b/vtkm/rendering/raytracing/TriangleIntersector.cxx index 3a31a0bcc..05eebf823 100644 --- a/vtkm/rendering/raytracing/TriangleIntersector.cxx +++ b/vtkm/rendering/raytracing/TriangleIntersector.cxx @@ -356,12 +356,12 @@ public: const vtkm::cont::Field scalarField, const vtkm::Range& scalarRange) { - const bool isSupportedField = scalarField.IsFieldCell() || scalarField.IsFieldPoint(); + const bool isSupportedField = scalarField.IsCellField() || scalarField.IsPointField(); if (!isSupportedField) { throw vtkm::cont::ErrorBadValue("Field not accociated with cell set or points"); } - const bool isAssocPoints = scalarField.IsFieldPoint(); + const bool isAssocPoints = scalarField.IsPointField(); // Find the triangle normal vtkm::worklet::DispatcherMapField(CalculateNormals()) diff --git a/vtkm/rendering/raytracing/VolumeRendererStructured.cxx b/vtkm/rendering/raytracing/VolumeRendererStructured.cxx index 9cf33b54f..268a6753a 100644 --- a/vtkm/rendering/raytracing/VolumeRendererStructured.cxx +++ b/vtkm/rendering/raytracing/VolumeRendererStructured.cxx @@ -829,12 +829,12 @@ void VolumeRendererStructured::RenderOnDevice(vtkm::rendering::raytracing::Ray

AddLogData("calc_ray_start", time); timer.Start(); - const bool isSupportedField = ScalarField->IsFieldCell() || ScalarField->IsFieldPoint(); + const bool isSupportedField = ScalarField->IsCellField() || ScalarField->IsPointField(); if (!isSupportedField) { throw vtkm::cont::ErrorBadValue("Field not accociated with cell set or points"); } - const bool isAssocPoints = ScalarField->IsFieldPoint(); + const bool isAssocPoints = ScalarField->IsPointField(); if (IsUniformDataSet) {