changing helper method slightly.

This commit is contained in:
Jeremy Meredith 2015-05-19 14:35:32 -04:00
parent 39b1b9cc18
commit 5bd8939d6c
2 changed files with 5 additions and 3 deletions

@ -63,11 +63,12 @@ public:
ids[i] = Connectivity.GetPortalControl().Get(start+i);
}
void PrepareToAddCells(vtkm::Id numShapes, vtkm::Id maxIdsPerShape)
/// First method to add cells -- one at a time.
void PrepareToAddCells(vtkm::Id numShapes, vtkm::Id connectivityMaxLen)
{
Shapes.Allocate(numShapes);
NumIndices.Allocate(numShapes);
Connectivity.Allocate(numShapes * maxIdsPerShape);
Connectivity.Allocate(connectivityMaxLen);
MapCellToConnectivityIndex.Allocate(numShapes);
NumShapes = 0;
ConnectivityLength = 0;
@ -92,6 +93,7 @@ public:
Connectivity.Shrink(ConnectivityLength);
}
/// Second method to add cells -- all at once.
void FillViaCopy(const std::vector<vtkm::Id> &cellTypes,
const std::vector<vtkm::Id> &numIndices,
const std::vector<vtkm::Id> &connectivity)

@ -208,7 +208,7 @@ MakeTestDataSet::Make3DExplicitDataSet1()
vtkm::cont::CellSetExplicit *cs = new vtkm::cont::CellSetExplicit("cells",2);
vtkm::cont::ExplicitConnectivity &ec = cs->nodesOfCellsConnectivity;
ec.PrepareToAddCells(2, 4);
ec.PrepareToAddCells(2, 7);
ec.AddCell(vtkm::VTKM_TRIANGLE, 3, make_Vec<vtkm::Id>(0,1,2));
ec.AddCell(vtkm::VTKM_QUAD, 4, make_Vec<vtkm::Id>(2,1,3,4));
ec.CompleteAddingCells();