Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tetrahedralize and Triangulate don't generate warnings under CUDA.

Browse Source
This commit is contained in:
Robert Maynard 2017-04-17 16:21:29 -04:00
parent 2a4e55770f
commit f1493cde0d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vtkm/worklet/Tetrahedralize.h
View File

@ -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

5
vtkm/worklet/Triangulate.h
View File

@ -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

6
vtkm/worklet/internal/TriangulateTables.h
View File

@ -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()
{ }