From 2e7e3fff64f50fe095ba698707c55a04f286dd15 Mon Sep 17 00:00:00 2001
From: Jeremy Meredith <jsmeredith@gmail.com>
Date: Wed, 15 Apr 2015 12:33:27 -0400
Subject: [PATCH] using dynamic array handle in field.

---
 vtkm/cont/DataSet.h | 11 ++++-------
 vtkm/cont/Field.h   |  5 +++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/vtkm/cont/DataSet.h b/vtkm/cont/DataSet.h
index 33f6822cf..77a22cd5a 100644
--- a/vtkm/cont/DataSet.h
+++ b/vtkm/cont/DataSet.h
@@ -12,6 +12,8 @@
 namespace vtkm {
 namespace cont {
 
+class CellSet;
+
 class DataSet
 {
 public:
@@ -38,18 +40,13 @@ public:
 
   vtkm::Id x_idx, y_idx, z_idx;
 
+
   ExplicitConnectivity conn;
   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:
   std::vector<vtkm::cont::Field> Fields;
-
-
+  std::vector<vtkm::cont::CellSet*> CellSets;
 };
 
 }
diff --git a/vtkm/cont/Field.h b/vtkm/cont/Field.h
index f74300821..c8bfa9183 100644
--- a/vtkm/cont/Field.h
+++ b/vtkm/cont/Field.h
@@ -37,7 +37,7 @@ public:
   {
   }
 
-  vtkm::cont::ArrayHandle<vtkm::FloatDefault> &GetData()
+  vtkm::cont::DynamicArrayHandle &GetData()
   {
     return data;
   }
@@ -57,7 +57,8 @@ public:
   */
   
 private:
-  vtkm::cont::ArrayHandle<vtkm::FloatDefault> data;
+  //vtkm::cont::ArrayHandle<vtkm::FloatDefault> data;
+  vtkm::cont::DynamicArrayHandle data;
 };