Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Fixing dashboard warnings

Browse Source
This commit is contained in:
Abhishek Yenpure 2022-02-02 18:00:05 +05:30
parent 4db0cecc1f
commit 7f2badfce3
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vtkm/worklet/cellmetrics/CellSkewMetric.h
View File

@ -93,14 +93,14 @@ VTKM_EXEC OutType CellSkewMetric(const vtkm::IdComponent& numPts,
using Vector = typename PointCoordVecType::ComponentType;
const Vector X0 = GetQuadX0<Scalar, Vector, CollectionOfPoints>(pts);
const Vector X1 = GetQuadX1<Scalar, Vector, CollectionOfPoints>(pts);
const Scalar X0Mag = vtkm::Magnitude(X0);
const Scalar X1Mag = vtkm::Magnitude(X1);
const auto X0Mag = vtkm::Magnitude(X0);
const auto X1Mag = vtkm::Magnitude(X1);
if (X0Mag < Scalar(0.0) || X1Mag < Scalar(0.0))
if (Scalar(X0Mag) < Scalar(0.0) || Scalar(X1Mag) < Scalar(0.0))
return Scalar(0.0);
const Vector x0Normalized = X0 / X0Mag;
const Vector x1Normalized = X1 / X1Mag;
const Scalar dot = vtkm::Dot(x0Normalized, x1Normalized);
const Scalar dot = static_cast<Scalar>(vtkm::Dot(x0Normalized, x1Normalized));
return vtkm::Abs(dot);
}
}

24
vtkm/worklet/cellmetrics/CellTaperMetric.h
View File

@ -102,22 +102,22 @@ VTKM_EXEC OutType CellTaperMetric(const vtkm::IdComponent& numPts,
UNUSED(ec);
using Scalar = OutType;
Scalar X1 = vtkm::Sqrt(vtkm::MagnitudeSquared((pts[1] - pts[0]) + (pts[2] - pts[3]) +
(pts[5] - pts[4]) + (pts[6] - pts[7])));
Scalar X2 = vtkm::Sqrt(vtkm::MagnitudeSquared((pts[3] - pts[0]) + (pts[2] - pts[1]) +
(pts[7] - pts[4]) + (pts[6] - pts[5])));
Scalar X3 = vtkm::Sqrt(vtkm::MagnitudeSquared((pts[4] - pts[0]) + (pts[5] - pts[1]) +
(pts[6] - pts[2]) + (pts[7] - pts[3])));
Scalar X1 = static_cast<Scalar>(vtkm::Sqrt(vtkm::MagnitudeSquared(
(pts[1] - pts[0]) + (pts[2] - pts[3]) + (pts[5] - pts[4]) + (pts[6] - pts[7]))));
Scalar X2 = static_cast<Scalar>(vtkm::Sqrt(vtkm::MagnitudeSquared(
(pts[3] - pts[0]) + (pts[2] - pts[1]) + (pts[7] - pts[4]) + (pts[6] - pts[5]))));
Scalar X3 = static_cast<Scalar>(vtkm::Sqrt(vtkm::MagnitudeSquared(
(pts[4] - pts[0]) + (pts[5] - pts[1]) + (pts[6] - pts[2]) + (pts[7] - pts[3]))));
if ((X1 <= Scalar(0.0)) || (X2 <= Scalar(0.0)) || (X3 <= Scalar(0.0)))
{
return vtkm::Infinity<Scalar>();
}
Scalar X12 = vtkm::Sqrt(vtkm::MagnitudeSquared(((pts[2] - pts[3]) - (pts[1] - pts[0])) +
((pts[6] - pts[7]) - (pts[5] - pts[4]))));
Scalar X13 = vtkm::Sqrt(vtkm::MagnitudeSquared(((pts[5] - pts[1]) - (pts[4] - pts[0])) +
((pts[6] - pts[2]) - (pts[7] - pts[3]))));
Scalar X23 = vtkm::Sqrt(vtkm::MagnitudeSquared(((pts[7] - pts[4]) - (pts[3] - pts[0])) +
((pts[6] - pts[5]) - (pts[2] - pts[1]))));
Scalar X12 = static_cast<Scalar>(vtkm::Sqrt(vtkm::MagnitudeSquared(
((pts[2] - pts[3]) - (pts[1] - pts[0])) + ((pts[6] - pts[7]) - (pts[5] - pts[4])))));
Scalar X13 = static_cast<Scalar>(vtkm::Sqrt(vtkm::MagnitudeSquared(
((pts[5] - pts[1]) - (pts[4] - pts[0])) + ((pts[6] - pts[2]) - (pts[7] - pts[3])))));
Scalar X23 = static_cast<Scalar>(vtkm::Sqrt(vtkm::MagnitudeSquared(
((pts[7] - pts[4]) - (pts[3] - pts[0])) + ((pts[6] - pts[5]) - (pts[2] - pts[1])))));
Scalar T12 = X12 / vtkm::Min(X1, X2);
Scalar T13 = X13 / vtkm::Min(X1, X3);
Scalar T23 = X23 / vtkm::Min(X2, X3);

4
vtkm/worklet/cellmetrics/CellWarpageMetric.h
View File

@ -67,8 +67,8 @@ VTKM_EXEC OutType CellWarpageMetric(const vtkm::IdComponent& numPts,
if (N0Mag < Scalar(0.0) || N1Mag < Scalar(0.0) || N2Mag < Scalar(0.0) || N3Mag < Scalar(0.0))
return vtkm::Infinity<Scalar>();
const Scalar n0dotn2 = vtkm::Dot(N0Mag, N2Mag);
const Scalar n1dotn3 = vtkm::Dot(N1Mag, N3Mag);
const Scalar n0dotn2 = static_cast<Scalar>(vtkm::Dot(N0Mag, N2Mag));
const Scalar n1dotn3 = static_cast<Scalar>(vtkm::Dot(N1Mag, N3Mag));
const Scalar min = vtkm::Min(n0dotn2, n1dotn3);
const Scalar minCubed = vtkm::Pow(min, 3);