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

In DynamicCellSet, expose CellSet API.

Browse Source 
Also changes GetCellSet() to CastToBase().
This commit is contained in:
T.J. Corona 2016-08-02 13:38:13 -04:00
parent 8f406cf460
commit 8ad8eeda77
10 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/cont/DataSet.h
View File

@ -227,7 +227,7 @@ public:
out<<" CellSets["<<this->GetNumberOfCellSets()<<"]\n"; out<<" CellSets["<<this->GetNumberOfCellSets()<<"]\n";
for (vtkm::Id index = 0; index < this->GetNumberOfCellSets(); index++) for (vtkm::Id index = 0; index < this->GetNumberOfCellSets(); index++)
{ {
this->GetCellSet(index).GetCellSet().PrintSummary(out); this->GetCellSet(index).PrintSummary(out);
} }
out<<" Fields["<<this->GetNumberOfFields()<<"]\n"; out<<" Fields["<<this->GetNumberOfFields()<<"]\n";
@ -281,7 +281,7 @@ private:
{ {
for (std::size_t index=0; index < static_cast<size_t>(this->GetNumberOfCellSets()); ++index) for (std::size_t index=0; index < static_cast<size_t>(this->GetNumberOfCellSets()); ++index)
{ {
if (this->CellSets[index].GetCellSet().GetName() == name) if (this->CellSets[index].GetName() == name)
{ {
found = true; found = true;
return static_cast<vtkm::Id>(index); return static_cast<vtkm::Id>(index);

8
vtkm/cont/DataSetFieldAdd.h
View File

@ -133,7 +133,7 @@ public:
vtkm::Id cellSetIndex = 0) vtkm::Id cellSetIndex = 0)
{ {
std::string cellSetName = std::string cellSetName =
dataSet.GetCellSet(cellSetIndex).GetCellSet().GetName(); dataSet.GetCellSet(cellSetIndex).GetName();
DataSetFieldAdd::AddCellField(dataSet, fieldName, field, cellSetName); DataSetFieldAdd::AddCellField(dataSet, fieldName, field, cellSetName);
} }
template <typename T, typename Storage> template <typename T, typename Storage>
@ -145,7 +145,7 @@ public:
vtkm::Id cellSetIndex = 0) vtkm::Id cellSetIndex = 0)
{ {
std::string cellSetName = std::string cellSetName =
dataSet.GetCellSet(cellSetIndex).GetCellSet().GetName(); dataSet.GetCellSet(cellSetIndex).GetName();
DataSetFieldAdd::AddCellField(dataSet, fieldName, field, cellSetName); DataSetFieldAdd::AddCellField(dataSet, fieldName, field, cellSetName);
} }
template<typename T> template<typename T>
@ -157,7 +157,7 @@ public:
vtkm::Id cellSetIndex = 0) vtkm::Id cellSetIndex = 0)
{ {
std::string cellSetName = std::string cellSetName =
dataSet.GetCellSet(cellSetIndex).GetCellSet().GetName(); dataSet.GetCellSet(cellSetIndex).GetName();
DataSetFieldAdd::AddCellField(dataSet, fieldName, field, cellSetName); DataSetFieldAdd::AddCellField(dataSet, fieldName, field, cellSetName);
} }
@ -170,7 +170,7 @@ public:
vtkm::Id cellSetIndex = 0) vtkm::Id cellSetIndex = 0)
{ {
std::string cellSetName = std::string cellSetName =
dataSet.GetCellSet(cellSetIndex).GetCellSet().GetName(); dataSet.GetCellSet(cellSetIndex).GetName();
DataSetFieldAdd::AddCellField(dataSet, fieldName, field, n, cellSetName); DataSetFieldAdd::AddCellField(dataSet, fieldName, field, n, cellSetName);
} }

39
vtkm/cont/DynamicCellSet.h
View File

@ -181,7 +181,7 @@ public:
/// Returns the contained cell set as the abstract \c CellSet type. /// Returns the contained cell set as the abstract \c CellSet type.
/// ///
VTKM_CONT_EXPORT VTKM_CONT_EXPORT
const vtkm::cont::CellSet &GetCellSet() const { const vtkm::cont::CellSet &CastToBase() const {
return *reinterpret_cast<const vtkm::cont::CellSet *>( return *reinterpret_cast<const vtkm::cont::CellSet *>(
this->CellSetContainer->GetVoidPointer()); this->CellSetContainer->GetVoidPointer());
} }
@ -257,6 +257,43 @@ public:
return newCellSet; return newCellSet;
} }
VTKM_CONT_EXPORT
virtual std::string GetName() const
{
return this->CastToBase().GetName();
}
VTKM_CONT_EXPORT
virtual vtkm::Id GetNumberOfCells() const
{
return this->CastToBase().GetNumberOfCells();
}
VTKM_CONT_EXPORT
virtual vtkm::Id GetNumberOfFaces() const
{
return this->CastToBase().GetNumberOfFaces();
}
VTKM_CONT_EXPORT
virtual vtkm::Id GetNumberOfEdges() const
{
return this->CastToBase().GetNumberOfEdges();
}
VTKM_CONT_EXPORT
virtual vtkm::Id GetNumberOfPoints() const
{
return this->CastToBase().GetNumberOfPoints();
}
VTKM_CONT_EXPORT
virtual void PrintSummary(std::ostream& stream) const
{
return this->CastToBase().PrintSummary(stream);
}
private: private:
boost::shared_ptr<vtkm::cont::internal::SimplePolymorphicContainerBase> boost::shared_ptr<vtkm::cont::internal::SimplePolymorphicContainerBase>
CellSetContainer; CellSetContainer;

2
vtkm/cont/testing/UnitTestDataSetBuilderExplicit.cxx
View File

@ -59,7 +59,7 @@ void ValidateDataSet(const vtkm::cont::DataSet &ds,
"Wrong number of coordinate systems."); "Wrong number of coordinate systems.");
VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == numPoints, VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == numPoints,
"Wrong number of coordinates."); "Wrong number of coordinates.");
VTKM_TEST_ASSERT(ds.GetCellSet().GetCellSet().GetNumberOfCells() == numCells, VTKM_TEST_ASSERT(ds.GetCellSet().GetNumberOfCells() == numCells,
"Wrong number of cells."); "Wrong number of cells.");
//Make sure bounds are correct. //Make sure bounds are correct.

2
vtkm/cont/testing/UnitTestDataSetBuilderRectilinear.cxx
View File

@ -58,7 +58,7 @@ void ValidateDataSet(const vtkm::cont::DataSet &ds,
"Wrong number of coordinate systems."); "Wrong number of coordinate systems.");
VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == numPoints, VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == numPoints,
"Wrong number of coordinates."); "Wrong number of coordinates.");
VTKM_TEST_ASSERT(ds.GetCellSet().GetCellSet().GetNumberOfCells() == numCells, VTKM_TEST_ASSERT(ds.GetCellSet().GetNumberOfCells() == numCells,
"Wrong number of cells."); "Wrong number of cells.");
//Make sure the bounds are correct. //Make sure the bounds are correct.

2
vtkm/cont/testing/UnitTestDataSetBuilderUniform.cxx
View File

@ -58,7 +58,7 @@ void ValidateDataSet(const vtkm::cont::DataSet &ds,
"Wrong number of coordinate systems."); "Wrong number of coordinate systems.");
VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == numPoints, VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == numPoints,
"Wrong number of coordinates."); "Wrong number of coordinates.");
VTKM_TEST_ASSERT(ds.GetCellSet().GetCellSet().GetNumberOfCells() == numCells, VTKM_TEST_ASSERT(ds.GetCellSet().GetNumberOfCells() == numCells,
"Wrong number of cells."); "Wrong number of cells.");

4
vtkm/cont/testing/UnitTestDynamicCellSet.cxx
View File

@ -80,8 +80,8 @@ void TryNewInstance(
VTKM_TEST_ASSERT(newCellSet.template IsType<CellSetType>(), VTKM_TEST_ASSERT(newCellSet.template IsType<CellSetType>(),
"New cell set wrong type."); "New cell set wrong type.");
VTKM_TEST_ASSERT(&originalCellSet.GetCellSet() VTKM_TEST_ASSERT(&originalCellSet.CastToBase()
!= &newCellSet.GetCellSet(), != &newCellSet.CastToBase(),
"NewInstance did not make a copy."); "NewInstance did not make a copy.");
} }

2
vtkm/filter/CellAverage.hxx
View File

@ -71,7 +71,7 @@ vtkm::filter::ResultField CellAverage::DoExecute(
outArray, outArray,
outputName, outputName,
vtkm::cont::Field::ASSOC_CELL_SET, vtkm::cont::Field::ASSOC_CELL_SET,
cellSet.GetCellSet().GetName()); cellSet.GetName());
} }
} }

10
vtkm/io/reader/testing/UnitTestVTKDataSetReader.cxx
View File

@ -332,7 +332,7 @@ void TestReadingPolyData(Format format)
"Incorrect number of fields"); "Incorrect number of fields");
VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == 8, VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == 8,
"Incorrect number of points"); "Incorrect number of points");
VTKM_TEST_ASSERT(ds.GetCellSet().GetCellSet().GetNumberOfCells() == 6, VTKM_TEST_ASSERT(ds.GetCellSet().GetNumberOfCells() == 6,
"Incorrect number of cells"); "Incorrect number of cells");
VTKM_TEST_ASSERT(ds.GetCellSet().IsType<vtkm::cont::CellSetSingleType<> >(), VTKM_TEST_ASSERT(ds.GetCellSet().IsType<vtkm::cont::CellSetSingleType<> >(),
"Incorrect cellset type"); "Incorrect cellset type");
@ -350,7 +350,7 @@ void TestReadingStructuredPoints(Format format)
"Incorrect number of fields"); "Incorrect number of fields");
VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == 72, VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == 72,
"Incorrect number of points"); "Incorrect number of points");
VTKM_TEST_ASSERT(ds.GetCellSet().GetCellSet().GetNumberOfCells() == 30, VTKM_TEST_ASSERT(ds.GetCellSet().GetNumberOfCells() == 30,
"Incorrect number of cells"); "Incorrect number of cells");
VTKM_TEST_ASSERT(ds.GetCellSet().IsType<vtkm::cont::CellSetStructured<3> >(), VTKM_TEST_ASSERT(ds.GetCellSet().IsType<vtkm::cont::CellSetStructured<3> >(),
"Incorrect cellset type"); "Incorrect cellset type");
@ -368,7 +368,7 @@ void TestReadingStructuredPointsVisIt(Format format)
"Incorrect number of fields"); "Incorrect number of fields");
VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == 64, VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == 64,
"Incorrect number of points"); "Incorrect number of points");
VTKM_TEST_ASSERT(ds.GetCellSet().GetCellSet().GetNumberOfCells() == 27, VTKM_TEST_ASSERT(ds.GetCellSet().GetNumberOfCells() == 27,
"Incorrect number of cells"); "Incorrect number of cells");
VTKM_TEST_ASSERT(ds.GetCellSet().IsType<vtkm::cont::CellSetStructured<3> >(), VTKM_TEST_ASSERT(ds.GetCellSet().IsType<vtkm::cont::CellSetStructured<3> >(),
"Incorrect cellset type"); "Incorrect cellset type");
@ -388,7 +388,7 @@ void TestReadingUnstructuredGrid(Format format)
"Incorrect number of fields"); "Incorrect number of fields");
VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == 26, VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == 26,
"Incorrect number of points"); "Incorrect number of points");
VTKM_TEST_ASSERT(ds.GetCellSet().GetCellSet().GetNumberOfCells() == 15, VTKM_TEST_ASSERT(ds.GetCellSet().GetNumberOfCells() == 15,
"Incorrect number of cells"); "Incorrect number of cells");
VTKM_TEST_ASSERT(ds.GetCellSet().IsType<vtkm::cont::CellSetExplicit<> >(), VTKM_TEST_ASSERT(ds.GetCellSet().IsType<vtkm::cont::CellSetExplicit<> >(),
"Incorrect cellset type"); "Incorrect cellset type");
@ -406,7 +406,7 @@ void TestReadingUnstructuredGridVisIt(Format format)
"Incorrect number of fields"); "Incorrect number of fields");
VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == 26, VTKM_TEST_ASSERT(ds.GetCoordinateSystem().GetData().GetNumberOfValues() == 26,
"Incorrect number of points"); "Incorrect number of points");
VTKM_TEST_ASSERT(ds.GetCellSet().GetCellSet().GetNumberOfCells() == 15, VTKM_TEST_ASSERT(ds.GetCellSet().GetNumberOfCells() == 15,
"Incorrect number of cells"); "Incorrect number of cells");
VTKM_TEST_ASSERT(ds.GetCellSet().IsType<vtkm::cont::CellSetExplicit<> >(), VTKM_TEST_ASSERT(ds.GetCellSet().IsType<vtkm::cont::CellSetExplicit<> >(),
"Incorrect cellset type"); "Incorrect cellset type");

2
vtkm/io/writer/VTKDataSetWriter.h
View File

@ -265,7 +265,7 @@ private:
{ {
continue; continue;
} }
if (field.GetAssocCellSet() != cellSet.GetCellSet().GetName()) { if (field.GetAssocCellSet() != cellSet.GetName()) {
continue; continue;
} }