Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fix cell measure when using double precision as default.

Browse Source
This commit is contained in:
David Thompson 2018-05-18 13:33:33 -04:00
parent ffe7f67e52
commit 52a1495859
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtkm/exec/CellMeasure.h
View File

@ -60,10 +60,10 @@ VTKM_EXEC OutType CellMeasure(const vtkm::IdComponent& numPts,
}
else
{
arcLength = Magnitude(pts[1] - pts[0]);
arcLength = static_cast<OutType>(Magnitude(pts[1] - pts[0]));
for (int ii = 2; ii < numPts; ++ii)
{
arcLength += Magnitude(pts[ii] - pts[ii - 1]);
arcLength += static_cast<OutType>(Magnitude(pts[ii] - pts[ii - 1]));
}
}
return arcLength;
@ -84,7 +84,7 @@ VTKM_EXEC OutType CellMeasure(const vtkm::IdComponent& numPts,
}
typename PointCoordVecType::ComponentType v1 = pts[1] - pts[0];
typename PointCoordVecType::ComponentType v2 = pts[2] - pts[0];
OutType area = OutType(0.5) * Magnitude(Cross(v1, v2));
OutType area = OutType(0.5) * static_cast<OutType>(Magnitude(Cross(v1, v2)));
return area;
}

2
vtkm/filter/testing/UnitTestCellMeasuresFilter.cxx
View File

@ -55,7 +55,7 @@ void TestCellMeasuresFilter(vtkm::cont::DataSet& dataset,
VTKM_TEST_ASSERT(temp.GetNumberOfValues() == static_cast<vtkm::Id>(expected.size()),
"Output field could not be found or was improper.");
vtkm::cont::ArrayHandle<vtkm::Float32> resultArrayHandle;
vtkm::cont::ArrayHandle<vtkm::FloatDefault> resultArrayHandle;
temp.CopyTo(resultArrayHandle);
VTKM_TEST_ASSERT(resultArrayHandle.GetNumberOfValues() == static_cast<vtkm::Id>(expected.size()),
"Wrong number of entries in the output dataset");

4
vtkm/worklet/testing/UnitTestCellMeasure.cxx
View File

@ -34,7 +34,7 @@ void TestCellMeasureUniform3D()
vtkm::cont::testing::MakeTestDataSet testDataSet;
vtkm::cont::DataSet dataSet = testDataSet.Make3DUniformDataSet0();
vtkm::cont::ArrayHandle<vtkm::Float32> result;
vtkm::cont::ArrayHandle<vtkm::FloatDefault> result;
vtkm::worklet::DispatcherMapTopology<vtkm::worklet::CellMeasure<vtkm::Volume>> dispatcher;
dispatcher.Invoke(dataSet.GetCellSet(), dataSet.GetCoordinateSystem(), result);
@ -55,7 +55,7 @@ void TestCellMeasureWorklet(vtkm::cont::DataSet& dataset,
{
std::cout << "Testing CellMeasures Filter on " << msg << "\n";
vtkm::cont::ArrayHandle<vtkm::Float32> result;
vtkm::cont::ArrayHandle<vtkm::FloatDefault> result;
vtkm::worklet::DispatcherMapTopology<vtkm::worklet::CellMeasure<IntegrationType>> dispatcher;
dispatcher.Invoke(dataset.GetCellSet(), dataset.GetCoordinateSystem(), result);