From 27c39217d4b542282d141106fbf71f6c540df192 Mon Sep 17 00:00:00 2001 From: dpugmire Date: Tue, 16 Jun 2020 11:43:20 -0400 Subject: [PATCH] remove debug statements --- vtkm/io/VTKPolyDataReader.cxx | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/vtkm/io/VTKPolyDataReader.cxx b/vtkm/io/VTKPolyDataReader.cxx index 75a76c357..e134d6160 100644 --- a/vtkm/io/VTKPolyDataReader.cxx +++ b/vtkm/io/VTKPolyDataReader.cxx @@ -61,7 +61,7 @@ void VTKPolyDataReader::Read() { throw vtkm::io::ErrorIO("Incorrect DataSet type"); } - std::cout << __FILE__ << " " << __LINE__ << std::endl; + //We need to be able to handle VisIt files which dump Field data //at the top of a VTK file std::string tag; @@ -71,12 +71,10 @@ void VTKPolyDataReader::Read() this->ReadGlobalFields(); this->DataFile->Stream >> tag; } - std::cout << __FILE__ << " " << __LINE__ << std::endl; // Read the points internal::parseAssert(tag == "POINTS"); this->ReadPoints(); - std::cout << __FILE__ << " " << __LINE__ << std::endl; vtkm::Id numPoints = this->DataSet.GetNumberOfPoints(); @@ -109,20 +107,17 @@ void VTKPolyDataReader::Read() this->DataFile->Stream.seekg(-static_cast(tag.length()), std::ios_base::cur); break; } - std::cout << __FILE__ << " " << __LINE__ << std::endl; vtkm::cont::ArrayHandle cellConnectivity; vtkm::cont::ArrayHandle cellNumIndices; this->ReadCells(cellConnectivity, cellNumIndices); - std::cout << __FILE__ << " " << __LINE__ << std::endl; connectivityArrays.push_back(cellConnectivity); numIndicesArrays.push_back(cellNumIndices); shapesBuffer.insert( shapesBuffer.end(), static_cast(cellNumIndices.GetNumberOfValues()), shape); - std::cout << __FILE__ << " " << __LINE__ << std::endl; } - std::cout << __FILE__ << " " << __LINE__ << std::endl; + vtkm::cont::ArrayHandle connectivity = ConcatinateArrayHandles(connectivityArrays); vtkm::cont::ArrayHandle numIndices = ConcatinateArrayHandles(numIndicesArrays); vtkm::cont::ArrayHandle shapes; @@ -130,11 +125,11 @@ void VTKPolyDataReader::Read() std::copy(shapesBuffer.begin(), shapesBuffer.end(), vtkm::cont::ArrayPortalToIteratorBegin(shapes.WritePortal())); - std::cout << __FILE__ << " " << __LINE__ << std::endl; + vtkm::cont::ArrayHandle permutation; vtkm::io::internal::FixupCellSet(connectivity, numIndices, shapes, permutation); this->SetCellsPermutation(permutation); - std::cout << __FILE__ << " " << __LINE__ << std::endl; + if (vtkm::io::internal::IsSingleShape(shapes)) { vtkm::cont::CellSetSingleType<> cellSet; @@ -149,10 +144,9 @@ void VTKPolyDataReader::Read() cellSet.Fill(numPoints, shapes, connectivity, offsets); this->DataSet.SetCellSet(cellSet); } - std::cout << __FILE__ << " " << __LINE__ << std::endl; + // Read points and cell attributes this->ReadAttributes(); - std::cout << __FILE__ << " " << __LINE__ << std::endl; } } } // namespace vtkm::io