From 2955b834e773e23e6419f54babab1873a0a5da78 Mon Sep 17 00:00:00 2001 From: Roxana Bujack Date: Tue, 7 Nov 2023 10:46:38 -0700 Subject: [PATCH] use float default instead of 64 --- vtkm/Bounds.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/vtkm/Bounds.h b/vtkm/Bounds.h index 674a89f24..05da5cd8e 100644 --- a/vtkm/Bounds.h +++ b/vtkm/Bounds.h @@ -108,7 +108,7 @@ struct Bounds /// are empty, 0 is returned. /// VTKM_EXEC_CONT - vtkm::Float64 Volume() const + vtkm::FloatDefault Volume() const { if (this->IsNonEmpty()) { @@ -126,7 +126,7 @@ struct Bounds /// are empty, 0 is returned. /// VTKM_EXEC_CONT - vtkm::Float64 Area() const + vtkm::FloatDefault Area() const { if (this->IsNonEmpty()) { @@ -144,9 +144,9 @@ struct Bounds /// are empty, the results are undefined. /// VTKM_EXEC_CONT - vtkm::Vec3f_64 Center() const + vtkm::Vec3f Center() const { - return vtkm::Vec3f_64(this->X.Center(), this->Y.Center(), this->Z.Center()); + return vtkm::Vec3f(this->X.Center(), this->Y.Center(), this->Z.Center()); } /// \b Returns the min point of the bounds @@ -155,7 +155,7 @@ struct Bounds /// are empty, the results are undefined. /// VTKM_EXEC_CONT - vtkm::Vec3f_64 MinCorner() const { return vtkm::Vec3f_64(this->X.Min, this->Y.Min, this->Z.Min); } + vtkm::Vec3f MinCorner() const { return vtkm::Vec3f(this->X.Min, this->Y.Min, this->Z.Min); } /// \b Returns the max point of the bounds /// @@ -163,7 +163,7 @@ struct Bounds /// are empty, the results are undefined. /// VTKM_EXEC_CONT - vtkm::Vec3f_64 MaxCorner() const { return vtkm::Vec3f_64(this->X.Max, this->Y.Max, this->Z.Max); } + vtkm::Vec3f MaxCorner() const { return vtkm::Vec3f(this->X.Max, this->Y.Max, this->Z.Max); } /// \b Returns all cornes of the bounds /// @@ -171,7 +171,7 @@ struct Bounds /// are empty, the results are undefined. /// VTKM_EXEC_CONT - void Corners(vtkm::Vec3f_64* corners) const + void Corners(vtkm::Vec3f* corners) const { corners[0] = vtkm::Vec3f(this->X.Min, this->Y.Min, this->Z.Min); corners[1] = vtkm::Vec3f(this->X.Min, this->Y.Min, this->Z.Max); @@ -189,11 +189,11 @@ struct Bounds /// are empty, the results are undefined. /// VTKM_EXEC_CONT - vtkm::Float64 Distance(vtkm::Vec3f_64 point) const + vtkm::FloatDefault Distance(vtkm::Vec3f point) const { - vtkm::Vec3f_64 corners[8]; + vtkm::Vec3f corners[8]; Corners(corners); - vtkm::Float64 distance = std::numeric_limits::max(); + vtkm::FloatDefault distance = std::numeric_limits::max(); for (unsigned int p = 0; p < 8; p++) { distance = std::min(distance, std::sqrt(vtkm::Dot(corners[p] - point, corners[p] - point)));