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

data model tweaks.

Browse Source 
fix a bad commit.
This commit is contained in:
Dave Pugmire 2015-01-28 11:27:15 -05:00
parent 62f243e819
commit 01dce61672
3 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vtkm/cont/DataSet.h
View File

@ -1,5 +1,5 @@
#ifndef vtk_m_cont_DataModel_h
#define vtk_m_cont_DataModel_h
#ifndef vtk_m_cont_DataSet_h
#define vtk_m_cont_DataSet_h
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/DynamicArrayHandle.h>
@ -7,15 +7,18 @@
namespace vtkm {
namespace cont {
class DataModel
class DataSet
{
public:
DataModel()
DataSet()
{
//Initialize the Points to some hardcoded value.
//Make some triangles.
}
//EAVL-esque everything is a field data model
vtkm::Vec<vtkm::cont::ArrayHandle<FloatDefault, vtkm::cont::StorageTagBasic>, 1> Fields;
vtkm::Id x_idx, y_idx, z_idx;
//traditional data-model
vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::FloatDefault,3> > Points;
vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::FloatDefault,1> > Field;
};
@ -24,4 +27,4 @@ public:
} // namespace vtkm::cont
#endif //vtk_m_cont_DataModel_h
#endif //vtk_m_cont_DataSet_h

1
vtkm/cont/testing/CMakeLists.txt
View File

@ -32,6 +32,7 @@ set(unit_tests
UnitTestArrayHandleUniformPointCoordinates.cxx
UnitTestArrayPortalToIterators.cxx
UnitTestContTesting.cxx
UnitTestDataSet.cxx
UnitTestDeviceAdapterAlgorithmDependency.cxx
UnitTestDeviceAdapterAlgorithmGeneral.cxx
UnitTestDeviceAdapterSerial.cxx

26
vtkm/cont/testing/TestBuild_vtkm_cont_DataSet.cxx
View File

@ -9,29 +9,5 @@
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();
return 0;
}