From ea13c27613d6026653d38778da4810904eb74598 Mon Sep 17 00:00:00 2001 From: Louis Gombert Date: Thu, 9 Mar 2023 16:46:58 +0100 Subject: [PATCH] Minor Shrink filter fixes --- vtkm/filter/geometry_refinement/worklet/Shrink.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vtkm/filter/geometry_refinement/worklet/Shrink.h b/vtkm/filter/geometry_refinement/worklet/Shrink.h index 5d2a6c5bb..a412d9b26 100644 --- a/vtkm/filter/geometry_refinement/worklet/Shrink.h +++ b/vtkm/filter/geometry_refinement/worklet/Shrink.h @@ -115,24 +115,24 @@ public: vtkm::cont::Invoker invoke; // First pass : count the new number of points per cell, shapes and compute centroids - vtkm::cont::ArrayHandle CellPointCount; - vtkm::cont::ArrayHandle Centroids; + vtkm::cont::ArrayHandle cellPointCount; + vtkm::cont::ArrayHandle centroids; vtkm::cont::CellSetExplicit<>::ShapesArrayType shapeArray; - invoke(PrepareCellsForShrink{}, oldCellset, CellPointCount, Centroids, shapeArray, oldCoords); + invoke(PrepareCellsForShrink{}, oldCellset, cellPointCount, centroids, shapeArray, oldCoords); // Second pass : compute new point positions and mappings to input points vtkm::cont::ArrayHandle newPoints; - vtkm::worklet::ScatterCounting scatter(CellPointCount, true); + vtkm::worklet::ScatterCounting scatter(cellPointCount, true); vtkm::cont::ArrayHandle offsets = scatter.GetInputToOutputMap(); - vtkm::Id totalPoints = scatter.GetOutputRange(CellPointCount.GetNumberOfValues()); + vtkm::Id totalPoints = scatter.GetOutputRange(cellPointCount.GetNumberOfValues()); ComputeNewPoints worklet = ComputeNewPoints(shinkFactor); invoke(worklet, scatter, oldCellset, offsets, - Centroids, + centroids, oldPointsMapping, newPoints, newCoords, @@ -141,7 +141,7 @@ public: newCellset.Fill(totalPoints, shapeArray, newPoints, - vtkm::cont::ConvertNumComponentsToOffsets(CellPointCount)); + vtkm::cont::ConvertNumComponentsToOffsets(cellPointCount)); } }; } // namespace vtkm::worklet