mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 18:45:43 +00:00
Enable triangulation on CellSetSingleType
The code path for doing either tetrahedralization or triangulation on a CellSetSingleType was not actually doing any work. Changed the worklet implementation so that these work on CellSetExplicit with any template parameters (which includes CellSetSingleType).
This commit is contained in:
parent
c494963626
commit
1bd70d9c22
@ -95,15 +95,8 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
template <typename CellSetType>
|
||||
vtkm::cont::CellSetSingleType<> Run(
|
||||
const CellSetType& vtkmNotUsed(cellSet),
|
||||
vtkm::cont::ArrayHandle<vtkm::IdComponent>& vtkmNotUsed(outCellsPerCell))
|
||||
{
|
||||
return vtkm::cont::CellSetSingleType<>();
|
||||
}
|
||||
|
||||
vtkm::cont::CellSetSingleType<> Run(const vtkm::cont::CellSetExplicit<>& cellSet,
|
||||
template <typename SS, typename CS, typename OS>
|
||||
vtkm::cont::CellSetSingleType<> Run(const vtkm::cont::CellSetExplicit<SS, CS, OS>& cellSet,
|
||||
vtkm::cont::ArrayHandle<vtkm::IdComponent>& outCellsPerCell)
|
||||
{
|
||||
vtkm::cont::CellSetSingleType<> outCellSet;
|
||||
|
@ -97,20 +97,10 @@ public:
|
||||
connectivityOut[2] = connectivityIn[triIndices[2]];
|
||||
}
|
||||
};
|
||||
template <typename CellSetType>
|
||||
vtkm::cont::CellSetSingleType<> Run(
|
||||
const CellSetType& vtkmNotUsed(cellSet),
|
||||
vtkm::cont::ArrayHandle<vtkm::IdComponent>& vtkmNotUsed(outCellsPerCell))
|
||||
{
|
||||
vtkm::cont::CellSetSingleType<> outCellSet;
|
||||
return outCellSet;
|
||||
}
|
||||
};
|
||||
template <>
|
||||
vtkm::cont::CellSetSingleType<> TriangulateExplicit::Run(
|
||||
const vtkm::cont::CellSetExplicit<>& cellSet,
|
||||
template <typename SS, typename CS, typename OS>
|
||||
vtkm::cont::CellSetSingleType<> Run(const vtkm::cont::CellSetExplicit<SS, CS, OS>& cellSet,
|
||||
vtkm::cont::ArrayHandle<vtkm::IdComponent>& outCellsPerCell)
|
||||
{
|
||||
{
|
||||
vtkm::cont::CellSetSingleType<> outCellSet;
|
||||
|
||||
// Input topology
|
||||
@ -135,9 +125,12 @@ vtkm::cont::CellSetSingleType<> TriangulateExplicit::Run(
|
||||
cellSet, tables.PrepareForInput(), vtkm::cont::make_ArrayHandleGroupVec<3>(outConnectivity));
|
||||
|
||||
// Add cells to output cellset
|
||||
outCellSet.Fill(cellSet.GetNumberOfPoints(), vtkm::CellShapeTagTriangle::Id, 3, outConnectivity);
|
||||
outCellSet.Fill(
|
||||
cellSet.GetNumberOfPoints(), vtkm::CellShapeTagTriangle::Id, 3, outConnectivity);
|
||||
return outCellSet;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace vtkm::worklet
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user