Merge topic 'triangulate_warnings'
f1493cde Tetrahedralize and Triangulate don't generate warnings under CUDA. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !745
This commit is contained in:
commit
f0d126aab7
@ -69,7 +69,7 @@ public:
|
||||
const DeviceAdapter&)
|
||||
{
|
||||
TetrahedralizeExplicit<DeviceAdapter> worklet;
|
||||
return worklet.Run(cellSet, this->OutCellsPerCell);
|
||||
return worklet.Run(cellSet, this->OutCellsPerCell);
|
||||
}
|
||||
|
||||
// Tetrahedralize structured data set, save number of tetra cells per input
|
||||
@ -78,7 +78,7 @@ public:
|
||||
const DeviceAdapter&)
|
||||
{
|
||||
TetrahedralizeStructured<DeviceAdapter> worklet;
|
||||
return worklet.Run(cellSet, this->OutCellsPerCell);
|
||||
return worklet.Run(cellSet, this->OutCellsPerCell);
|
||||
}
|
||||
|
||||
template <typename DeviceAdapter>
|
||||
@ -86,7 +86,6 @@ public:
|
||||
const DeviceAdapter&)
|
||||
{
|
||||
throw vtkm::cont::ErrorBadType("CellSetStructured<2> can't be tetrahedralized");
|
||||
return vtkm::cont::CellSetSingleType<>();
|
||||
}
|
||||
|
||||
// Using the saved input to output cells, expand cell data
|
||||
|
@ -69,7 +69,7 @@ public:
|
||||
const DeviceAdapter&)
|
||||
{
|
||||
TriangulateExplicit<DeviceAdapter> worklet;
|
||||
return worklet.Run(cellSet, this->OutCellsPerCell);
|
||||
return worklet.Run(cellSet, this->OutCellsPerCell);
|
||||
}
|
||||
|
||||
// Triangulate structured data set, save number of triangulated cells per input
|
||||
@ -78,7 +78,7 @@ public:
|
||||
const DeviceAdapter&)
|
||||
{
|
||||
TriangulateStructured<DeviceAdapter> worklet;
|
||||
return worklet.Run(cellSet, this->OutCellsPerCell);
|
||||
return worklet.Run(cellSet, this->OutCellsPerCell);
|
||||
}
|
||||
|
||||
template <typename DeviceAdapter>
|
||||
@ -86,7 +86,6 @@ public:
|
||||
const DeviceAdapter&)
|
||||
{
|
||||
throw vtkm::cont::ErrorBadType("CellSetStructured<3> can't be triangulated");
|
||||
return vtkm::cont::CellSetSingleType<>();
|
||||
}
|
||||
|
||||
// Using the saved input to output cells, expand cell data
|
||||
|
@ -86,7 +86,8 @@ public:
|
||||
typedef typename TriangulateArrayHandle::ExecutionTypes<Device>::PortalConst
|
||||
PortalType;
|
||||
|
||||
VTKM_EXEC_CONT
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
VTKM_EXEC
|
||||
TriangulateTablesExecutionObject()
|
||||
{ }
|
||||
|
||||
@ -234,7 +235,8 @@ public:
|
||||
typedef typename TriangulateArrayHandle::ExecutionTypes<Device>::PortalConst
|
||||
PortalType;
|
||||
|
||||
VTKM_EXEC_CONT
|
||||
VTKM_SUPPRESS_EXEC_WARNINGS
|
||||
VTKM_EXEC
|
||||
TetrahedralizeTablesExecutionObject()
|
||||
{ }
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user