From 15075dfd6d63211fc857eb83b1f9274e9f92fa08 Mon Sep 17 00:00:00 2001
From: Jeremy Meredith <jsmeredith@gmail.com>
Date: Mon, 5 Jan 2015 15:40:10 -0500
Subject: [PATCH 1/6] removing reference to PyExapander (also a test commit for
 the branch)

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 945eaff66..a307c136e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,7 +128,7 @@ vtkm_install_headers(
 # * Meta programming language
 find_package(BoostHeaders ${VTKm_REQUIRED_BOOST_VERSION} REQUIRED)
 
-find_package(Pyexpander)
+###find_package(Pyexpander)
 
 #-----------------------------------------------------------------------------
 # Add subdirectories

From a36e5345cf73830cea6383b0c662c43a61e9b59a Mon Sep 17 00:00:00 2001
From: Dave Pugmire <pugmire@ornl.gov>
Date: Mon, 5 Jan 2015 15:45:08 -0500
Subject: [PATCH 2/6] test commit

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a307c136e..0185b427b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,7 +128,7 @@ vtkm_install_headers(
 # * Meta programming language
 find_package(BoostHeaders ${VTKm_REQUIRED_BOOST_VERSION} REQUIRED)
 
-###find_package(Pyexpander)
+##find_package(Pyexpander)
 
 #-----------------------------------------------------------------------------
 # Add subdirectories

From f3c1ebf5e6a87461343bd4a19e6c82072f0916cb Mon Sep 17 00:00:00 2001
From: Jeremy Meredith <jsmeredith@gmail.com>
Date: Mon, 5 Jan 2015 15:47:10 -0500
Subject: [PATCH 3/6] test commit again

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0185b427b..72aec795b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,7 +128,7 @@ vtkm_install_headers(
 # * Meta programming language
 find_package(BoostHeaders ${VTKm_REQUIRED_BOOST_VERSION} REQUIRED)
 
-##find_package(Pyexpander)
+#find_package(Pyexpander)
 
 #-----------------------------------------------------------------------------
 # Add subdirectories

From 82b97c450773207d957ef2f600c98a90a688c40f Mon Sep 17 00:00:00 2001
From: Dave Pugmire <pugmire@ornl.gov>
Date: Mon, 5 Jan 2015 15:47:48 -0500
Subject: [PATCH 4/6] test commit

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72aec795b..278da267f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,7 +128,7 @@ vtkm_install_headers(
 # * Meta programming language
 find_package(BoostHeaders ${VTKm_REQUIRED_BOOST_VERSION} REQUIRED)
 
-#find_package(Pyexpander)
+#####find_package(Pyexpander)
 
 #-----------------------------------------------------------------------------
 # Add subdirectories

From 7ff3c8285805c0af164e61a89ae0242e4d31dcd2 Mon Sep 17 00:00:00 2001
From: dpugmire <pugmire@ornl.gov>
Date: Tue, 27 Jan 2015 16:01:11 -0500
Subject: [PATCH 5/6] Add some initial DataSet

---
 vtkm/cont/DataSet.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 vtkm/cont/DataSet.h

diff --git a/vtkm/cont/DataSet.h b/vtkm/cont/DataSet.h
new file mode 100644
index 000000000..18eb3df90
--- /dev/null
+++ b/vtkm/cont/DataSet.h
@@ -0,0 +1,27 @@
+#ifndef vtk_m_cont_DataModel_h
+#define vtk_m_cont_DataModel_h
+
+#include <vtkm/cont/ArrayHandle.h>
+#include <vtkm/cont/DynamicArrayHandle.h>
+
+namespace vtkm {
+namespace cont {
+    
+class DataModel
+{
+public:
+    DataModel()
+    {
+	//Initialize the Points to some hardcoded value.
+	//Make some triangles.
+    }
+
+    vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::FloatDefault,3> > Points;
+    vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::FloatDefault,1> > Field;
+};
+
+}
+} // namespace vtkm::cont
+
+
+#endif //vtk_m_cont_DataModel_h

From f0c9879296bddaca59d42aaeb9d0ef7423f1457a Mon Sep 17 00:00:00 2001
From: Dave Pugmire <pugmire@ornl.gov>
Date: Tue, 27 Jan 2015 16:09:32 -0500
Subject: [PATCH 6/6] Testing file for data set

---
 .../testing/TestBuild_vtkm_cont_DataSet.cxx   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 vtkm/cont/testing/TestBuild_vtkm_cont_DataSet.cxx

diff --git a/vtkm/cont/testing/TestBuild_vtkm_cont_DataSet.cxx b/vtkm/cont/testing/TestBuild_vtkm_cont_DataSet.cxx
new file mode 100644
index 000000000..2a0493455
--- /dev/null
+++ b/vtkm/cont/testing/TestBuild_vtkm_cont_DataSet.cxx
@@ -0,0 +1,37 @@
+//mark that we are including headers as test for completeness.
+//This is used by headers that include thrust to properly define a proper
+//device backend / system
+#define VTKM_TEST_HEADER_BUILD
+
+#define BOOST_SP_DISABLE_THREADS
+
+#include <vtkm/cont/DataSet.h>
+
+int Test_Build_For_DataSet()
+{
+    std::cout<<"Running DataSet test"<<std::endl;
+    vtkm::cont::DataModel m;
+    int nVerts = 3;
+    m.Points.PrepareForOutput(nVerts, VTKM_DEFAULT_DEVICE_ADAPTER_TAG()); //vtkm::cont::DeviceAdapterTagSerial());
+    m.Field.PrepareForOutput(nVerts, vtkm::cont::DeviceAdapterTagSerial());
+
+    vtkm::Vec<vtkm::FloatDefault,3> V0 = vtkm::Vec<vtkm::FloatDefault,3>(0, 0, 0);
+    vtkm::Vec<vtkm::FloatDefault,3> V1 = vtkm::Vec<vtkm::FloatDefault,3>(1, 0, 0);
+    vtkm::Vec<vtkm::FloatDefault,3> V2 = vtkm::Vec<vtkm::FloatDefault,3>(1, 1, 0);
+    
+    m.Points.GetPortalControl().Set(0, V0);
+    m.Points.GetPortalControl().Set(1, V1);
+    m.Points.GetPortalControl().Set(2, V2);
+
+    m.Field.GetPortalControl().Set(0, vtkm::Vec<vtkm::FloatDefault,1>(10));
+    m.Field.GetPortalControl().Set(1, vtkm::Vec<vtkm::FloatDefault,1>(20));
+    m.Field.GetPortalControl().Set(2, vtkm::Vec<vtkm::FloatDefault,1>(30));
+    
+    return 0;
+}
+
+int
+TestBuild_vtkm_cont_DataSet(int, char*[])
+{
+    return Test_Build_For_DataSet();
+}