Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix warnings and add to tetrahedralize unit test

Browse Source
This commit is contained in:
Patricia Kroll Fasel - 090207 2017-03-28 09:43:32 -06:00
parent 9dcfbf368f
commit 7c64785f3c
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/filter/Tetrahedralize.hxx
View File

@ -63,7 +63,7 @@ inline VTKM_CONT
vtkm::filter::ResultDataSet Tetrahedralize::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::filter::PolicyBase<DerivedPolicy>& policy,
const DeviceAdapter& device)
const DeviceAdapter&)
{
const vtkm::cont::DynamicCellSet& cells =
input.GetCellSet(this->GetActiveCellSetIndex());

2
vtkm/filter/Triangulate.hxx
View File

@ -63,7 +63,7 @@ inline VTKM_CONT
vtkm::filter::ResultDataSet Triangulate::DoExecute(
const vtkm::cont::DataSet& input,
const vtkm::filter::PolicyBase<DerivedPolicy>& policy,
const DeviceAdapter& device)
const DeviceAdapter&)
{
const vtkm::cont::DynamicCellSet& cells =
input.GetCellSet(this->GetActiveCellSetIndex());

18
vtkm/filter/testing/UnitTestTetrahedralizeFilter.cxx
View File

@ -48,6 +48,15 @@ public:
"Wrong result for Tetrahedralize");
VTKM_TEST_ASSERT(test_equal(output.GetField("pointvar").GetData().GetNumberOfValues(), 18),
"Wrong number of points for Tetrahedralize");
vtkm::cont::ArrayHandle<vtkm::Float32> outData =
output.GetField("cellvar").GetData().Cast<vtkm::cont::ArrayHandle<vtkm::Float32> >();
VTKM_TEST_ASSERT(outData.GetPortalConstControl().Get(5) == 100.2f, "Wrong cell field data");
VTKM_TEST_ASSERT(outData.GetPortalConstControl().Get(6) == 100.2f, "Wrong cell field data");
VTKM_TEST_ASSERT(outData.GetPortalConstControl().Get(7) == 100.2f, "Wrong cell field data");
VTKM_TEST_ASSERT(outData.GetPortalConstControl().Get(8) == 100.2f, "Wrong cell field data");
VTKM_TEST_ASSERT(outData.GetPortalConstControl().Get(9) == 100.2f, "Wrong cell field data");
}
void TestExplicit() const
@ -68,6 +77,15 @@ public:
"Wrong result for Tetrahedralize");
VTKM_TEST_ASSERT(test_equal(output.GetField("pointvar").GetData().GetNumberOfValues(), 11),
"Wrong number of points for Tetrahedralize");
vtkm::cont::ArrayHandle<vtkm::Float32> outData =
output.GetField("cellvar").GetData().Cast<vtkm::cont::ArrayHandle<vtkm::Float32> >();
VTKM_TEST_ASSERT(outData.GetPortalConstControl().Get(5) == 110.f, "Wrong cell field data");
VTKM_TEST_ASSERT(outData.GetPortalConstControl().Get(6) == 110.f, "Wrong cell field data");
VTKM_TEST_ASSERT(outData.GetPortalConstControl().Get(8) == 130.5f, "Wrong cell field data");
VTKM_TEST_ASSERT(outData.GetPortalConstControl().Get(9) == 130.5f, "Wrong cell field data");
VTKM_TEST_ASSERT(outData.GetPortalConstControl().Get(10) == 130.5f, "Wrong cell field data");
}
void operator()() const

2
vtkm/worklet/Tetrahedralize.h
View File

@ -82,7 +82,7 @@ public:
}
template <typename DeviceAdapter>
vtkm::cont::CellSetSingleType<> Run(const vtkm::cont::CellSetStructured<2> &cellSet,
vtkm::cont::CellSetSingleType<> Run(const vtkm::cont::CellSetStructured<2>&,
const DeviceAdapter&)
{
throw vtkm::cont::ErrorBadType("CellSetStructured<2> can't be tetrahedralized");

2
vtkm/worklet/Triangulate.h
View File

@ -82,7 +82,7 @@ public:
}
template <typename DeviceAdapter>
vtkm::cont::CellSetSingleType<> Run(const vtkm::cont::CellSetStructured<3> &cellSet,
vtkm::cont::CellSetSingleType<> Run(const vtkm::cont::CellSetStructured<3>&,
const DeviceAdapter&)
{
throw vtkm::cont::ErrorBadType("CellSetStructured<3> can't be triangulated");