Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'dataset-builder2' of gitlab.kitware.com:dpugmire/vtk-m into dataset-builder2

Browse Source
This commit is contained in:
Dave Pugmire 2015-12-24 11:21:08 -05:00
commit 665427dbb0
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/cont/ArrayHandleCartesianProduct.h
View File

@ -83,7 +83,6 @@ public:
{ {
vtkm::Id dim1 = this->PortalFirst.GetNumberOfValues(); vtkm::Id dim1 = this->PortalFirst.GetNumberOfValues();
vtkm::Id dim2 = this->PortalSecond.GetNumberOfValues(); vtkm::Id dim2 = this->PortalSecond.GetNumberOfValues();
vtkm::Id dim3 = this->PortalThird.GetNumberOfValues();
vtkm::Id dim12 = dim1*dim2; vtkm::Id dim12 = dim1*dim2;
vtkm::Id idx12 = index % dim12; vtkm::Id idx12 = index % dim12;
vtkm::Id i1 = idx12 % dim1; vtkm::Id i1 = idx12 % dim1;
@ -100,7 +99,6 @@ public:
{ {
vtkm::Id dim1 = this->PortalFirst.GetNumberOfValues(); vtkm::Id dim1 = this->PortalFirst.GetNumberOfValues();
vtkm::Id dim2 = this->PortalSecond.GetNumberOfValues(); vtkm::Id dim2 = this->PortalSecond.GetNumberOfValues();
vtkm::Id dim3 = this->PortalThird.GetNumberOfValues();
vtkm::Id dim12 = dim1*dim2; vtkm::Id dim12 = dim1*dim2;
vtkm::Id idx12 = index % dim12; vtkm::Id idx12 = index % dim12;

5
vtkm/cont/CMakeLists.txt
View File

@ -23,6 +23,7 @@ include_directories(${Boost_INCLUDE_DIRS})
set(headers set(headers
ArrayHandle.h ArrayHandle.h
ArrayHandleCast.h ArrayHandleCast.h
ArrayHandleCartesianProduct.h
ArrayHandleCompositeVector.h ArrayHandleCompositeVector.h
ArrayHandleConstant.h ArrayHandleConstant.h
ArrayHandleCounting.h ArrayHandleCounting.h
@ -44,6 +45,10 @@ set(headers
CellSetPermutation.h CellSetPermutation.h
CoordinateSystem.h CoordinateSystem.h
DataSet.h DataSet.h
DataSetBuilderExplicit.h
DataSetBuilderRectilinear.h
DataSetBuilderRegular.h
DataSetFieldAdd.h
DeviceAdapter.h DeviceAdapter.h
DeviceAdapterAlgorithm.h DeviceAdapterAlgorithm.h
DeviceAdapterSerial.h DeviceAdapterSerial.h

3
vtkm/cont/DataSetFieldAdd.h
View File

@ -21,6 +21,9 @@
#ifndef vtk_m_cont_DataSetFieldAdd_h #ifndef vtk_m_cont_DataSetFieldAdd_h
#define vtk_m_cont_DataSetFieldAdd_h #define vtk_m_cont_DataSetFieldAdd_h
#include <vtkm/cont/DataSet.h>
#include <vtkm/cont/Field.h>
namespace vtkm { namespace vtkm {
namespace cont { namespace cont {