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

Merge topic 'fix-clean-grid'

Browse Source 
5004e64c Fix CleanGrid when compact point fields is off

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !665
This commit is contained in:
Kenneth Moreland 2017-01-23 11:00:02 -05:00 committed by Kitware Robot
commit fe1c7c3228
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vtkm/filter/CleanGrid.hxx
View File

@ -128,11 +128,18 @@ CleanGrid::DoExecute(const vtkm::cont::DataSet &inData,
vtkm::cont::CoordinateSystem coordSystem =
inData.GetCoordinateSystem(coordSystemIndex);
vtkm::filter::ApplyPolicy(coordSystem,
Policy(),
vtkm::filter::FilterTraits<CleanGrid>())
.CastAndCall(detail::CleanCompactPointArrayFunctor<Device>(
outData,coordSystem.GetName(),this));
if (this->GetCompactPointFields())
{
vtkm::filter::ApplyPolicy(coordSystem,
Policy(),
vtkm::filter::FilterTraits<CleanGrid>())
.CastAndCall(detail::CleanCompactPointArrayFunctor<Device>(
outData,coordSystem.GetName(),this));
}
else
{
outData.AddCoordinateSystem(coordSystem);
}
}
return outData;

14
vtkm/filter/testing/UnitTestCleanGrid.cxx
View File

@ -25,7 +25,7 @@
namespace {
void TestUniformGrid()
void TestUniformGrid(vtkm::filter::CleanGrid clean)
{
std::cout << "Testing 'clean' uniform grid." << std::endl;
@ -33,8 +33,6 @@ void TestUniformGrid()
vtkm::cont::DataSet inData = makeData.Make2DUniformDataSet0();
vtkm::filter::CleanGrid clean;
vtkm::filter::ResultDataSet result = clean.Execute(inData);
VTKM_TEST_ASSERT(result.IsValid(), "Filter failed to execute");
@ -83,7 +81,15 @@ void TestUniformGrid()
void RunTest()
{
TestUniformGrid();
vtkm::filter::CleanGrid clean;
std::cout << "*** Test wqith compact point fields on" << std::endl;
clean.SetCompactPointFields(true);
TestUniformGrid(clean);
std::cout << "*** Test wqith compact point fields off" << std::endl;
clean.SetCompactPointFields(false);
TestUniformGrid(clean);
}
} // anonymous namespace