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

Merge topic 'add-test-data-set'

Browse Source 
ce7d2190 Fix winding of hexahedrons
22b3a4a7 Add a small test data set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !639
This commit is contained in:
Kenneth Moreland 2016-12-16 10:23:43 -05:00 committed by Kitware Robot
commit 1d605f6703
2 changed files with 106 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
vtkm/cont/testing/MakeTestDataSet.h
View File

@ -61,6 +61,7 @@ public:
vtkm::cont::DataSet Make3DExplicitDataSet2();
vtkm::cont::DataSet Make3DExplicitDataSet3();
vtkm::cont::DataSet Make3DExplicitDataSet4();
vtkm::cont::DataSet Make3DExplicitDataSet5();
vtkm::cont::DataSet Make3DExplicitDataSetCowNose();
};
@ -406,14 +407,14 @@ MakeTestDataSet::Make3DExplicitDataSet2()
const int nVerts = 8;
typedef vtkm::Vec<vtkm::Float32,3> CoordType;
CoordType coordinates[nVerts] = {
CoordType(0, 0, 0),
CoordType(1, 0, 0),
CoordType(1, 0, 1),
CoordType(0, 0, 1),
CoordType(0, 1, 0),
CoordType(1, 1, 0),
CoordType(1, 1, 1),
CoordType(0, 1, 1)
CoordType(0, 0, 0), // 0
CoordType(1, 0, 0), // 1
CoordType(1, 0, 1), // 2
CoordType(0, 0, 1), // 3
CoordType(0, 1, 0), // 4
CoordType(1, 1, 0), // 5
CoordType(1, 1, 1), // 6
CoordType(0, 1, 1) // 7
};
vtkm::Float32 vars[nVerts] = {10.1f, 20.1f, 30.2f, 40.2f, 50.3f, 60.2f, 70.2f, 80.3f};
@ -484,24 +485,24 @@ MakeTestDataSet::Make3DExplicitDataSet4()
vtkm::cont::CellSetExplicit<> cellSet(nVerts,"cells");
vtkm::Vec<vtkm::Id, 8> ids;
ids[0] = 0;
ids[1] = 1;
ids[1] = 4;
ids[2] = 5;
ids[3] = 4;
ids[3] = 1;
ids[4] = 3;
ids[5] = 2;
ids[5] = 7;
ids[6] = 6;
ids[7] = 7;
ids[7] = 2;
cellSet.PrepareToAddCells(2, 16);
cellSet.AddCell(vtkm::CELL_SHAPE_HEXAHEDRON, 8, ids);
ids[0] = 1;
ids[1] = 8;
ids[1] = 5;
ids[2] = 11;
ids[3] = 5;
ids[3] = 8;
ids[4] = 2;
ids[5] = 9;
ids[5] = 6;
ids[6] = 10;
ids[7] = 6;
ids[7] = 9;
cellSet.AddCell(vtkm::CELL_SHAPE_HEXAHEDRON, 8, ids);
cellSet.CompleteAddingCells();
@ -553,6 +554,90 @@ MakeTestDataSet::Make3DExplicitDataSet3()
return dataSet;
}
inline vtkm::cont::DataSet
MakeTestDataSet::Make3DExplicitDataSet5()
{
vtkm::cont::DataSet dataSet;
const int nVerts = 11;
typedef vtkm::Vec<vtkm::Float32,3> CoordType;
CoordType coordinates[nVerts] = {
CoordType(0, 0, 0), //0
CoordType(1, 0, 0), //1
CoordType(1, 0, 1), //2
CoordType(0, 0, 1), //3
CoordType(0, 1, 0), //4
CoordType(1, 1, 0), //5
CoordType(1, 1, 1), //6
CoordType(0, 1, 1), //7
CoordType(2, 0, 0), //8
CoordType(0, 2, 0), //9
CoordType(1, 2, 0) //10
};
vtkm::Float32 vars[nVerts] = {10.1f, 20.1f, 30.2f, 40.2f, 50.3f, 60.2f, 70.2f, 80.3f, 90.f, 10.f, 11.f};
dataSet.AddCoordinateSystem(
vtkm::cont::CoordinateSystem("coordinates", coordinates, nVerts));
//Set point scalar
dataSet.AddField(Field("pointvar",
vtkm::cont::Field::ASSOC_POINTS,
vars,
nVerts));
//Set cell scalar
const int nCells = 4;
vtkm::Float32 cellvar[nCells] = {100.1f, 110.f, 120.2f, 130.5f};
dataSet.AddField(Field("cellvar",
vtkm::cont::Field::ASSOC_CELL_SET,
"cells",
cellvar,
nCells));
vtkm::cont::CellSetExplicit<> cellSet(nVerts,"cells");
vtkm::Vec<vtkm::Id, 8> ids;
cellSet.PrepareToAddCells(nCells, 23);
ids[0] = 0;
ids[1] = 4;
ids[2] = 5;
ids[3] = 1;
ids[4] = 3;
ids[5] = 7;
ids[6] = 6;
ids[7] = 2;
cellSet.AddCell(vtkm::CELL_SHAPE_HEXAHEDRON, 8, ids);
ids[0] = 1;
ids[1] = 2;
ids[2] = 6;
ids[3] = 5;
ids[4] = 8;
cellSet.AddCell(vtkm::CELL_SHAPE_PYRAMID, 5, ids);
ids[0] = 5;
ids[1] = 10;
ids[2] = 8;
ids[3] = 6;
cellSet.AddCell(vtkm::CELL_SHAPE_TETRA, 4, ids);
ids[0] = 4;
ids[1] = 9;
ids[2] = 7;
ids[3] = 5;
ids[4] = 10;
ids[5] = 6;
cellSet.AddCell(vtkm::CELL_SHAPE_WEDGE, 6, ids);
cellSet.CompleteAddingCells();
//todo this need to be a reference/shared_ptr style class
dataSet.AddCellSet(cellSet);
return dataSet;
}
inline vtkm::cont::DataSet
MakeTestDataSet::Make3DExplicitDataSetCowNose()
{

10
vtkm/filter/testing/UnitTestPointAverageFilter.cxx
View File

@ -132,7 +132,7 @@ void TestPointAverageExplicit2()
std::cout << "Testing PointAverage Filter on Explicit data" << std::endl;
vtkm::cont::testing::MakeTestDataSet testDataSet;
vtkm::cont::DataSet dataSet = testDataSet.Make3DExplicitDataSet4();
vtkm::cont::DataSet dataSet = testDataSet.Make3DExplicitDataSet5();
vtkm::filter::ResultField result;
vtkm::filter::PointAverage pointAverage;
@ -150,11 +150,11 @@ void TestPointAverageExplicit2()
if(valid)
{
vtkm::Float32 expected[12] = { 100.1f, 105.05f, 105.05f, 100.1f,
100.1f, 105.05f, 105.05f, 100.1f,
110.0f, 110.0f, 110.0f, 110.0f
vtkm::Float32 expected[11] = { 100.1f, 105.05f, 105.05f, 100.1f,
115.3f, 115.2f, 115.2f, 115.3f,
115.1f, 130.5f, 125.35f
};
for (int i = 0; i < 12; ++i)
for (int i = 0; i < 11; ++i)
{
VTKM_TEST_ASSERT(test_equal(resultArrayHandle.GetPortalConstControl().Get(i),
expected[i]), "Wrong result for PointAverage worklet on 3D regular data");