Skip to content

GitLab

Commit 6b2c68bf authored by Steven Walton's avatar Steven Walton
Browse files
Options

Should be FloatType not FloatDefault

parent 90cf4684
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
vtkm/exec/cellmetrics/CellTaperMetric.h
View file @ 6b2c68bf
...@@ -60,17 +60,17 @@ VTKM_EXEC OutType CellTaperMetric(const vtkm::IdComponents &numPts, ...@@ -60,17 +60,17 @@ VTKM_EXEC OutType CellTaperMetric(const vtkm::IdComponents &numPts,
vtkm::CellShapeHex, vtkm::CellShapeHex,
const vtkm::exec::FunctorBase& worklet) const vtkm::exec::FunctorBase& worklet)
{ {
FloatDefault X1 = (pts[1] - pts[0]) + (pts[2] - pts[3]) + (pts[5] - pts[4]) + (pts[6] - pts[7]); FloatType X1 = (pts[1] - pts[0]) + (pts[2] - pts[3]) + (pts[5] - pts[4]) + (pts[6] - pts[7]);
FloatDefault X2 = (pts[3] - pts[0]) + (pts[2] - pts[1]) + (pts[7] - pts[4]) + (pts[6] - pts[5]); FloatType X2 = (pts[3] - pts[0]) + (pts[2] - pts[1]) + (pts[7] - pts[4]) + (pts[6] - pts[5]);
FloatDefault X3 = (pts[4] - pts[0]) + (pts[5] - pts[1]) + (pts[6] - pts[2]) + (pts[7] - pts[3]); FloatType X3 = (pts[4] - pts[0]) + (pts[5] - pts[1]) + (pts[6] - pts[2]) + (pts[7] - pts[3]);
if ((X1 < FLOAT_MIN) || (X2 < FLOAT_MIN) || (X3 < FLOAT_MIN)) if ((X1 < FLOAT_MIN) || (X2 < FLOAT_MIN) || (X3 < FLOAT_MIN))
return FLOAT_MAX; return FLOAT_MAX;
FloatDefault X12 = ((pts[2] - pts[3]) - (pts[1] - pts[0])) + ((pts[6] - pts[7]) - (pts[5] - pts[4])); FloatType X12 = ((pts[2] - pts[3]) - (pts[1] - pts[0])) + ((pts[6] - pts[7]) - (pts[5] - pts[4]));
FloatDefault X13 = ((pts[5] - pts[1]) - (pts[4] - pts[0])) + ((pts[6] - pts[2]) - (pts[7] - pts[3])); FloatType X13 = ((pts[5] - pts[1]) - (pts[4] - pts[0])) + ((pts[6] - pts[2]) - (pts[7] - pts[3]));
FloatDefault X23 = ((pts[7] - pts[4]) - (pts[3] - pts[0])) + ((pts[6] - pts[5]) - (pts[2] - pts[1])); FloatType X23 = ((pts[7] - pts[4]) - (pts[3] - pts[0])) + ((pts[6] - pts[5]) - (pts[2] - pts[1]));
FloatDefault T12 = X12 / vtkm::Min(X1,vtkm::Min(X2,X3)); FloatType T12 = X12 / vtkm::Min(X1,vtkm::Min(X2,X3));
FloatDefault T13 = X13 / vtkm::Min(X1,vtkm::Min(X2,X3)); FloatType T13 = X13 / vtkm::Min(X1,vtkm::Min(X2,X3));
FloatDefault T23 = X23 / vtkm::Min(X1,vtkm::Min(X2,X3)); FloatType T23 = X23 / vtkm::Min(X1,vtkm::Min(X2,X3));
return vtkm::Max(T12, vtkm::Max(T13,T23)); return vtkm::Max(T12, vtkm::Max(T13,T23));
} }
...@@ -80,11 +80,11 @@ VTKM_EXEC OutType CellTaperMetric(const vtkm::IdComponents &numPts, ...@@ -80,11 +80,11 @@ VTKM_EXEC OutType CellTaperMetric(const vtkm::IdComponents &numPts,
vtkm::CellShapeQuad, vtkm::CellShapeQuad,
const vtkm::exec::FunctorBase& worklet) const vtkm::exec::FunctorBase& worklet)
{ {
FloatDefault X1 = (pts[1] - pts[0]) + (pts[2] - pts[3]); FloatType X1 = (pts[1] - pts[0]) + (pts[2] - pts[3]);
FloatDefault X2 = (pts[0] - pts[3]) + (pts[2] - pts[1]); FloatType X2 = (pts[0] - pts[3]) + (pts[2] - pts[1]);
if ((X1 < FLOAT_MIN) || (X2 < FLOAT_MIN)) if ((X1 < FLOAT_MIN) || (X2 < FLOAT_MIN))
return FLOAT_MAX; return FLOAT_MAX;
FloatDefault X12 = vtkm::Magnitude((pts[0] - pts[1]) + (pts[2] - pts[3])); FloatType X12 = vtkm::Magnitude((pts[0] - pts[1]) + (pts[2] - pts[3]));
return X12 / vtkm::Min(X1,X2); return X12 / vtkm::Min(X1,X2);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment