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

using dynamic array handle in field.

Browse Source
This commit is contained in:
Jeremy Meredith 2015-04-15 12:33:27 -04:00
parent 64f80a1de9
commit 2e7e3fff64
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vtkm/cont/DataSet.h
View File

@ -12,6 +12,8 @@
namespace vtkm { namespace vtkm {
namespace cont { namespace cont {
class CellSet;
class DataSet class DataSet
{ {
public: public:
@ -38,18 +40,13 @@ public:
vtkm::Id x_idx, y_idx, z_idx; vtkm::Id x_idx, y_idx, z_idx;
ExplicitConnectivity conn; ExplicitConnectivity conn;
RegularConnectivity reg; RegularConnectivity reg;
//TODO: Logical structure: vtkm::Extents? Use EAVL logicalStructure?
//traditional data-model
vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::FloatDefault,3> > Points;
vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::FloatDefault,1> > Field;
private: private:
std::vector<vtkm::cont::Field> Fields; std::vector<vtkm::cont::Field> Fields;
std::vector<vtkm::cont::CellSet*> CellSets;
}; };
} }

5
vtkm/cont/Field.h
View File

@ -37,7 +37,7 @@ public:
{ {
} }
vtkm::cont::ArrayHandle<vtkm::FloatDefault> &GetData() vtkm::cont::DynamicArrayHandle &GetData()
{ {
return data; return data;
} }
@ -57,7 +57,8 @@ public:
*/ */
private: private:
vtkm::cont::ArrayHandle<vtkm::FloatDefault> data; //vtkm::cont::ArrayHandle<vtkm::FloatDefault> data;
vtkm::cont::DynamicArrayHandle data;
}; };