Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'splitsharpedges-point-count'

Browse Source 
aa5687512 Correct the number of points in `SplitSharpEdges` filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Abhishek Yenpure <abhi.yenpure@kitware.com>
Merge-request: !2912
This commit is contained in:
Kenneth Moreland 2022-11-02 12:49:57 +00:00 committed by Kitware Robot
commit e3f74cb482
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/filter/geometry_refinement/worklet/SplitSharpEdges.h
View File

@ -475,7 +475,7 @@ public:
// Create the new cellset
CellDeepCopy::Run(oldCellset, newCellset);
CellDeepCopy::Run(oldCellset, newCellset, this->NewPointsIdArray.GetNumberOfValues());
// FIXME: Since the non const get array function is not in CellSetExplict.h,
// here I just get a non-const copy of the array handle.
auto connectivityArrayHandle = newCellset.GetConnectivityArray(vtkm::TopologyElementTagCell(),

16
vtkm/worklet/CellDeepCopy.h
View File

@ -67,7 +67,8 @@ struct CellDeepCopy
typename OffsetsStorage>
VTKM_CONT static void Run(
const InCellSetType& inCellSet,
vtkm::cont::CellSetExplicit<ShapeStorage, ConnectivityStorage, OffsetsStorage>& outCellSet)
vtkm::cont::CellSetExplicit<ShapeStorage, ConnectivityStorage, OffsetsStorage>& outCellSet,
vtkm::Id numberOfPoints)
{
VTKM_IS_KNOWN_OR_UNKNOWN_CELL_SET(InCellSetType);
@ -89,10 +90,21 @@ struct CellDeepCopy
inCellSet, shapes, vtkm::cont::make_ArrayHandleGroupVecVariable(connectivity, offsets));
vtkm::cont::CellSetExplicit<ShapeStorage, ConnectivityStorage, OffsetsStorage> newCellSet;
newCellSet.Fill(inCellSet.GetNumberOfPoints(), shapes, connectivity, offsets);
newCellSet.Fill(numberOfPoints, shapes, connectivity, offsets);
outCellSet = newCellSet;
}
template <typename InCellSetType,
typename ShapeStorage,
typename ConnectivityStorage,
typename OffsetsStorage>
VTKM_CONT static void Run(
const InCellSetType& inCellSet,
vtkm::cont::CellSetExplicit<ShapeStorage, ConnectivityStorage, OffsetsStorage>& outCellSet)
{
Run(inCellSet, outCellSet, inCellSet.GetNumberOfPoints());
}
template <typename InCellSetType>
VTKM_CONT static vtkm::cont::CellSetExplicit<> Run(const InCellSetType& inCellSet)
{