Removed integer vector field from vector magnitude filter unit test
Integer vector field was causing link errors on Windows with Visual Studio.
This commit is contained in:
parent
70e145fd83
commit
f6d5d24c82
@ -18,8 +18,6 @@
|
||||
// this software.
|
||||
//============================================================================
|
||||
|
||||
#define VTKM_DEFAULT_TYPE_LIST_TAG ::vtkm::TypeListTagAll
|
||||
|
||||
#include <vtkm/filter/VectorMagnitude.h>
|
||||
#include <vtkm/cont/testing/MakeTestDataSet.h>
|
||||
#include <vtkm/cont/testing/Testing.h>
|
||||
@ -41,25 +39,15 @@ void TestVectorMagnitude()
|
||||
110.3, 120.3, 130.4, 140.4,
|
||||
150.4, 160.4, 170.5, 180.5};
|
||||
|
||||
vtkm::Int32 ivars[nVerts] = {10, 20, 30, 40, 50,
|
||||
60, 70, 80, 90, 100,
|
||||
110, 120, 130, 140,
|
||||
150, 160, 170, 180};
|
||||
|
||||
std::vector< vtkm::Vec<vtkm::Float64,3> > fvec(nVerts);
|
||||
std::vector< vtkm::Vec<vtkm::Int32,3> > ivec(nVerts);
|
||||
for(std::size_t i=0; i < fvec.size(); ++i)
|
||||
{
|
||||
fvec[i] = vtkm::make_Vec(fvars[i],fvars[i],fvars[i]);
|
||||
ivec[i] = vtkm::make_Vec(ivars[i],ivars[i],ivars[i]);
|
||||
}
|
||||
vtkm::cont::ArrayHandle< vtkm::Vec<vtkm::Float64,3> > finput =
|
||||
vtkm::cont::make_ArrayHandle(fvec);
|
||||
vtkm::cont::ArrayHandle< vtkm::Vec<vtkm::Int32,3> > iinput =
|
||||
vtkm::cont::make_ArrayHandle(ivec);
|
||||
|
||||
vtkm::cont::DataSetFieldAdd::AddPointField(dataSet, "double_vec_pointvar", finput);
|
||||
vtkm::cont::DataSetFieldAdd::AddPointField(dataSet, "integer_vec_pointvar", iinput);
|
||||
|
||||
vtkm::filter::ResultField result;
|
||||
vtkm::filter::VectorMagnitude vm;
|
||||
@ -85,25 +73,6 @@ void TestVectorMagnitude()
|
||||
}
|
||||
}
|
||||
|
||||
result = vm.Execute(dataSet, dataSet.GetField("integer_vec_pointvar"));
|
||||
|
||||
VTKM_TEST_ASSERT( result.IsValid(), "result should be valid" );
|
||||
VTKM_TEST_ASSERT(result.GetField().GetName() == "magnitude",
|
||||
"Output field has wrong name.");
|
||||
VTKM_TEST_ASSERT(result.GetField().GetAssociation() ==
|
||||
vtkm::cont::Field::ASSOC_POINTS,
|
||||
"Output field has wrong association");
|
||||
|
||||
valid = result.FieldAs(resultArrayHandle);
|
||||
if(valid)
|
||||
{
|
||||
for (vtkm::Id i = 0; i < resultArrayHandle.GetNumberOfValues(); ++i)
|
||||
{
|
||||
VTKM_TEST_ASSERT(test_equal(std::sqrt(3*ivars[i]*ivars[i]),
|
||||
resultArrayHandle.GetPortalConstControl().Get(i)),
|
||||
"Wrong result for Magnitude worklet");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user