Pushing for Abhishek (Don't merge)

This commit is contained in:
Steven Walton 2019-05-07 16:19:52 -07:00
parent cf61a645ea
commit 5feadd1661

@ -228,6 +228,7 @@ public:
}
void TestOffset3D1() const
<<<<<<< HEAD
{
std::cout << "Testing offset 3D-1" << std::endl;
using CellSetType = vtkm::cont::CellSetStructured<3>;
@ -297,6 +298,11 @@ public:
bool includeOffset = true;
cellSet.SetPointDimensions(vtkm::make_Vec(10, 10, 10));
vtkm::worklet::ExtractStructured worklet;
=======
{
std::cout << "Testing offset 3D-1" << std::endl;
using CellSetType = vtkm::cont::CellSetStructured<3>;
>>>>>>> 6cacc28... Pushing for Abhishek (Don't merge)
auto outCellSet = worklet.Run(cellSet, range, sample, includeBoundary, includeOffset);
CellSetType cs = outCellSet.Cast<CellSetType>();
@ -309,12 +315,12 @@ public:
CellSetType cellSet;
=======
// RangeID3 and subsample
vtkm::RangeId3 range(5, 15, 0, 10, 0, 10);
// RangeID3 and subsample
vtkm::RangeId3 range(5, 15, 0, 10, 0, 10);
vtkm::Id3 sample(1, 1, 1);
vtkm::Id3 test_offset(1, 1, 1);
vtkm::Id3 origin_offset(1, 1, 1);
vtkm::Id3 test_offset(10, 0, 0);
vtkm::Id3 no_offset(0, 0, 0);
vtkm::Id3 new_dims(5, 10, 10);
const vtkm::Int32 Dimensionality = 3;
bool includeBoundary = false;
bool includeOffset = false;
@ -324,14 +330,51 @@ public:
// Extract subset
vtkm::worklet::ExtractStructured worklet;
// worklet.Run(cellset, voi, sample rate, ...)
auto outCellSet = worklet.Run(cellSet, range, sample, includeBoundary, includeOffset);
//auto outCellSet = worklet.Run(cellSet, range, sample, includeBoundary, includeOffset);
vtkm::cont::DynamicCellSet outCellSet =
std::make_shared(worklet.Run(cellSet, range, sample, includeBoundary, includeOffset));
VTKM_TEST_ASSERT(test_equal(cellSet.GetGlobalPointIndexStart(), no_offset));
auto t4 = cellSet.GetGlobalPointIndexStart();
auto t5 = cellSet.GetPointDimensions();
vtkm::Id3 cellDims =
outCellSet.Cast<CellSetType>().GetSchedulingRange(vtkm::TopologyElementTagCell());
//vtkm::Id3 cellDims = outCellSet.GetSchedulingRange(vtkm::TopologyElementTagCell());
includeOffset = true;
outCellSet = worklet.Run(cellSet, range, sample, includeBoundary, includeOffset);
cellSet.SetGlobalPointIndexStart(test_offset);
VTKM_TEST_ASSERT(test_equal(cellSet.GetPointDimensions(), test_offset));
auto t1 = cellSet.GetPointDimensions();
auto t2 = cellSet.GetGlobalPointIndexStart();
auto t9 = outCellSet.Cast<CellSetType>().GetSchedulingRange(vtkm::TopologyElementTagCell());
//auto t3 = cellSet.GetGlobalPointDimensions();
std::cout << " " << std::endl;
}
void TestOffset3D2() const
{
std::cout << "Testing Offset 3D-2" << std::endl;
using CellSetType = vtkm::cont::CellSetStructured<3>;
vtkm::cont::DataSet dataSet = MakeTestDataSet().Make3DRectilinearDataSet0();
CellSetType cellSet;
dataSet.GetCellSet(0).CopyTo(cellSet);
vtkm::RangeId3 range(15, 20, 0, 10, 0, 10);
vtkm::Id3 sample(1, 1, 1);
vtkm::Id3 test_offset(15, 0, 0);
const vtkm::Int32 Dimensionality = 3;
bool includeBoundary = false;
bool includeOffset = true;
cellSet.SetPointDimensions(vtkm::make_Vec(10, 0, 0));
vtkm::Vec<vtkm::Id, Dimensionality> ptdim(cellSet.GetPointDimensions());
vtkm::worklet::ExtractStructured worklet;
auto outCellSet = worklet.Run(cellSet, range, sample, includeBoundary, includeOffset);
cellSet.SetGlobalPointIndexStart(test_offset);
auto test = cellSet.GetPointDimensions();
VTKM_TEST_ASSERT(test_equal(cellSet.GetPointDimensions(), test_offset));
<<<<<<< HEAD
//VTKM_TEST_ASSERT(test_equal(worklet.GetIncludeOffset(), includeOffset));
@ -366,6 +409,15 @@ public:
=======
>>>>>>> bdd013b... Getting there with ES
}
/*
void TestOffset3D3() const
{
std::cout << "Ehhh" << std::endl;
using CellSetType = vtkm::cont::CellSetStructured<3>;
vtkm::cont::DataSet dataSet = MakeTestDataSet().Make3DRectilinearDataSet0();
CellSetType cellset = dynamic_cells.Cast<CellSetStructured<3>>();
}
*/
void operator()() const
{
@ -376,8 +428,11 @@ public:
TestRectilinear3D();
TestOffset3D1();
TestOffset3D2();
<<<<<<< HEAD
TestOffset3D3();
TestOffset2D();
=======
>>>>>>> 6cacc28... Pushing for Abhishek (Don't merge)
}
};