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

Merge branch 'datamodel-design' of public.kitware.com:vtkm into datamodel-design

Browse Source
This commit is contained in:
Jeremy Meredith 2015-04-15 12:15:18 -04:00
commit 64f80a1de9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/cont/DataSet.h
View File

@ -39,7 +39,7 @@ public:
vtkm::Id x_idx, y_idx, z_idx;
ExplicitConnectivity conn;
RegularConnectivity3D reg;
RegularConnectivity reg;
//TODO: Logical structure: vtkm::Extents? Use EAVL logicalStructure?
//traditional data-model

4
vtkm/cont/RegularConnectivity.h
View File

@ -39,9 +39,9 @@ public:
void GetIndices(vtkm::Id index, vtkm::Vec<vtkm::Id,ItemTupleLength> &ids)
{
int i,j,k;
CalculateLogicalCellIndices3D(index, i,j,k);
CalculateLogicalCellIndices(index, i,j,k);
///\todo: assert ItemTupleLength >= 8, or return early?
ids[0] = CalculateNodeIndex3D(i, j, k);
ids[0] = CalculateNodeIndex(i, j, k);
if (ItemTupleLength <= 1) return;
ids[1] = ids[0] + 1;
if (ItemTupleLength <= 2) return;

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

@ -223,7 +223,7 @@ void TestDataSet_Regular()
//Set regular structure
ds.reg.SetNodeDimension3D(3,2,3);
ds.reg.SetNodeDimension(3,2,3);
//Run a worklet to populate a cell centered field.
vtkm::Float32 cellVals[4] = {-1.1, -1.2, -1.3, -1.4};