From 6b2c68bf0a9ab51da6d04fe2ae5fbdb5539b6cdc Mon Sep 17 00:00:00 2001 From: Steven Walton Date: Sat, 1 Jun 2019 19:57:45 -0700 Subject: [PATCH] Should be FloatType not FloatDefault --- vtkm/exec/cellmetrics/CellTaperMetric.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/vtkm/exec/cellmetrics/CellTaperMetric.h b/vtkm/exec/cellmetrics/CellTaperMetric.h index d4a614453..c3169be67 100644 --- a/vtkm/exec/cellmetrics/CellTaperMetric.h +++ b/vtkm/exec/cellmetrics/CellTaperMetric.h @@ -60,17 +60,17 @@ VTKM_EXEC OutType CellTaperMetric(const vtkm::IdComponents &numPts, vtkm::CellShapeHex, const vtkm::exec::FunctorBase& worklet) { - FloatDefault 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]); - FloatDefault X3 = (pts[4] - pts[0]) + (pts[5] - pts[1]) + (pts[6] - pts[2]) + (pts[7] - pts[3]); + FloatType X1 = (pts[1] - pts[0]) + (pts[2] - pts[3]) + (pts[5] - pts[4]) + (pts[6] - pts[7]); + FloatType X2 = (pts[3] - pts[0]) + (pts[2] - pts[1]) + (pts[7] - pts[4]) + (pts[6] - pts[5]); + 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)) return FLOAT_MAX; - FloatDefault 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])); - FloatDefault 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)); - FloatDefault T13 = X13 / vtkm::Min(X1,vtkm::Min(X2,X3)); - FloatDefault T23 = X23 / vtkm::Min(X1,vtkm::Min(X2,X3)); + FloatType X12 = ((pts[2] - pts[3]) - (pts[1] - pts[0])) + ((pts[6] - pts[7]) - (pts[5] - pts[4])); + FloatType X13 = ((pts[5] - pts[1]) - (pts[4] - pts[0])) + ((pts[6] - pts[2]) - (pts[7] - pts[3])); + FloatType X23 = ((pts[7] - pts[4]) - (pts[3] - pts[0])) + ((pts[6] - pts[5]) - (pts[2] - pts[1])); + FloatType T12 = X12 / vtkm::Min(X1,vtkm::Min(X2,X3)); + FloatType T13 = X13 / 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)); } @@ -80,11 +80,11 @@ VTKM_EXEC OutType CellTaperMetric(const vtkm::IdComponents &numPts, vtkm::CellShapeQuad, const vtkm::exec::FunctorBase& worklet) { - FloatDefault X1 = (pts[1] - pts[0]) + (pts[2] - pts[3]); - FloatDefault X2 = (pts[0] - pts[3]) + (pts[2] - pts[1]); + FloatType X1 = (pts[1] - pts[0]) + (pts[2] - pts[3]); + FloatType X2 = (pts[0] - pts[3]) + (pts[2] - pts[1]); if ((X1 < FLOAT_MIN) || (X2 < FLOAT_MIN)) 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); } -- GitLab