Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

changing mapcell input domain from input cell array to topology GetNumberOfCells.

Browse Source
This commit is contained in:
Jeremy Meredith 2015-02-04 15:51:13 -05:00
parent 2f83e08b7d
commit 6bd04efef2
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/cont/DataSet.h
View File

@ -11,7 +11,9 @@ class ExplicitConnectivity
{
public:
ExplicitConnectivity() : Shapes(), Connectivity() {}
vtkm::Id GetNumberOfCells() { return Shapes.GetNumberOfValues(); }
vtkm::cont::ArrayHandle<vtkm::Id, vtkm::cont::StorageTagBasic> Shapes;
vtkm::cont::ArrayHandle<vtkm::Id, vtkm::cont::StorageTagBasic> Connectivity;
};

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

@ -28,8 +28,8 @@ class CellType : public vtkm::worklet::WorkletMapCell
{
public:
typedef void ControlSignature(FieldCellIn<IdType> inCells, TopologyIn topology, FieldCellOut<Scalar> outCells);
typedef _3 ExecutionSignature(_1, vtkm::exec::arg::NodeIdTriplet); // FieldOut<Scalar> ExecutionSignature(FieldIn<Scalar>);
typedef _1 InputDomain;
typedef _3 ExecutionSignature(_1, vtkm::exec::arg::NodeIdTriplet);
typedef _2 InputDomain;
VTKM_CONT_EXPORT
CellType() { };

2
vtkm/worklet/DispatcherMapCell.h
View File

@ -81,7 +81,7 @@ public:
// array.
///\todo: GetNumberOfCells
vtkm::Id numInstances = inputDomain.GetNumberOfValues();
vtkm::Id numInstances = inputDomain.GetNumberOfCells();
///\todo:
this->BasicInvoke(invocation, numInstances);