mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
b1343474c1
For no particularly good reason, there were two functions that converted and array of counts to an array of offsets: `ConvertNumComponentsToOffsets` and `ConvertNumIndicesToOffsets`. These functions were identical, except one was defined in `ArrayHandleGroupVecVariable.h` and the other was defined in `CellSetExplicit.h`. These two functions have been consolidated into one (which is now called `ConvertNumComponentsToOffsets`). The consolidated function has also been put in its own header file: `ConvertNumComponentsToOffsets.h`. Normally, backward compatibility would be established using deprecated features. However, one of the things being worked on is the removal of device-specific code (e.g. `vtkm::cont::Algorithm`) from core classes like `CellSetExplicit` so that less code needs to use the device compiler (especially downstream code). Part of this change removed unnecessary includes of `Algorithm.h` in `ArrayHandleGroupVecVariable.h` and `CellSetExplicit.h`. This header had to be added to some classes that were not including it themselves.
90 lines
2.4 KiB
C++
90 lines
2.4 KiB
C++
//============================================================================
|
|
// Copyright (c) Kitware, Inc.
|
|
// All rights reserved.
|
|
// See LICENSE.txt for details.
|
|
//
|
|
// This software is distributed WITHOUT ANY WARRANTY; without even
|
|
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
|
// PURPOSE. See the above copyright notice for more information.
|
|
//============================================================================
|
|
|
|
#include <vtkm/io/VTKUnstructuredGridReader.h>
|
|
|
|
#include <vtkm/io/internal/VTKDataSetCells.h>
|
|
|
|
#include <vtkm/cont/ConvertNumComponentsToOffsets.h>
|
|
|
|
namespace vtkm
|
|
{
|
|
namespace io
|
|
{
|
|
|
|
VTKUnstructuredGridReader::VTKUnstructuredGridReader(const char* fileName)
|
|
: VTKDataSetReaderBase(fileName)
|
|
{
|
|
}
|
|
|
|
VTKUnstructuredGridReader::VTKUnstructuredGridReader(const std::string& fileName)
|
|
: VTKDataSetReaderBase(fileName)
|
|
{
|
|
}
|
|
|
|
void VTKUnstructuredGridReader::Read()
|
|
{
|
|
if (this->DataFile->Structure != vtkm::io::internal::DATASET_UNSTRUCTURED_GRID)
|
|
{
|
|
throw vtkm::io::ErrorIO("Incorrect DataSet type");
|
|
}
|
|
|
|
//We need to be able to handle VisIt files which dump Field data
|
|
//at the top of a VTK file
|
|
std::string tag;
|
|
this->DataFile->Stream >> tag;
|
|
if (tag == "FIELD")
|
|
{
|
|
this->ReadGlobalFields();
|
|
this->DataFile->Stream >> tag;
|
|
}
|
|
|
|
// Read the points
|
|
internal::parseAssert(tag == "POINTS");
|
|
this->ReadPoints();
|
|
|
|
vtkm::Id numPoints = this->DataSet.GetNumberOfPoints();
|
|
|
|
// Read the cellset
|
|
vtkm::cont::ArrayHandle<vtkm::Id> connectivity;
|
|
vtkm::cont::ArrayHandle<vtkm::IdComponent> numIndices;
|
|
vtkm::cont::ArrayHandle<vtkm::UInt8> shapes;
|
|
|
|
this->DataFile->Stream >> tag;
|
|
internal::parseAssert(tag == "CELLS");
|
|
|
|
this->ReadCells(connectivity, numIndices);
|
|
this->ReadShapes(shapes);
|
|
|
|
vtkm::cont::ArrayHandle<vtkm::Id> permutation;
|
|
vtkm::io::internal::FixupCellSet(connectivity, numIndices, shapes, permutation);
|
|
this->SetCellsPermutation(permutation);
|
|
|
|
if (vtkm::io::internal::IsSingleShape(shapes))
|
|
{
|
|
vtkm::cont::CellSetSingleType<> cellSet;
|
|
cellSet.Fill(
|
|
numPoints, shapes.ReadPortal().Get(0), numIndices.ReadPortal().Get(0), connectivity);
|
|
this->DataSet.SetCellSet(cellSet);
|
|
}
|
|
else
|
|
{
|
|
auto offsets = vtkm::cont::ConvertNumComponentsToOffsets(numIndices);
|
|
vtkm::cont::CellSetExplicit<> cellSet;
|
|
cellSet.Fill(numPoints, shapes, connectivity, offsets);
|
|
this->DataSet.SetCellSet(cellSet);
|
|
}
|
|
|
|
// Read points and cell attributes
|
|
this->ReadAttributes();
|
|
}
|
|
}
|
|
}
|