From 3f8da6e7e11864885e16917418dd0252061c1077 Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Tue, 1 Sep 2020 14:21:09 -0600 Subject: [PATCH] Fix some debugging code that should not have been there --- vtkm/filter/testing/UnitTestContourFilter.cxx | 4 +++- vtkm/io/VTKUnstructuredGridReader.cxx | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vtkm/filter/testing/UnitTestContourFilter.cxx b/vtkm/filter/testing/UnitTestContourFilter.cxx index da1a2d38a..6a085fb59 100644 --- a/vtkm/filter/testing/UnitTestContourFilter.cxx +++ b/vtkm/filter/testing/UnitTestContourFilter.cxx @@ -140,12 +140,14 @@ public: void TestContourWedges() const { + std::cout << "Testing Contour filter on wedge cells" << std::endl; + auto pathname = vtkm::cont::testing::Testing::DataPath("unstructured/wedge_cells.vtk"); vtkm::io::VTKDataSetReader reader(pathname); vtkm::cont::DataSet dataSet = reader.ReadDataSet(); - vtkm::cont::CellSetExplicit<> cellSet; + vtkm::cont::CellSetSingleType<> cellSet; dataSet.GetCellSet().CopyTo(cellSet); vtkm::cont::ArrayHandle fieldArray; diff --git a/vtkm/io/VTKUnstructuredGridReader.cxx b/vtkm/io/VTKUnstructuredGridReader.cxx index 0fb69cacb..8a5a0b136 100644 --- a/vtkm/io/VTKUnstructuredGridReader.cxx +++ b/vtkm/io/VTKUnstructuredGridReader.cxx @@ -65,8 +65,7 @@ void VTKUnstructuredGridReader::Read() vtkm::io::internal::FixupCellSet(connectivity, numIndices, shapes, permutation); this->SetCellsPermutation(permutation); - //DRP - if (false) //vtkm::io::internal::IsSingleShape(shapes)) + if (vtkm::io::internal::IsSingleShape(shapes)) { vtkm::cont::CellSetSingleType<> cellSet; cellSet.Fill( -- GitLab