Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-05 01:49:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

next round of changes

Browse Source
This commit is contained in:
Roxana Bujack 2024-01-03 16:23:16 -07:00
parent d9875a41dc
commit 53ab4d41e4
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vtkm/Bounds.h
View File

@ -12,6 +12,7 @@
#define vtk_m_Bounds_h
#include <vtkm/Range.h>
#include <vtkm/VectorAnalysis.h>
namespace vtkm
{
@ -171,7 +172,7 @@ struct Bounds
/// are empty, the results are undefined.
///
VTKM_EXEC_CONT
void Corners(vtkm::Vec3f_64* corners) const
void Corners(vtkm::Vec<vtkm::Vec3f_64, 8> corners) const
{
corners[0] = vtkm::Vec3f_64(this->X.Min, this->Y.Min, this->Z.Min);
corners[1] = vtkm::Vec3f_64(this->X.Min, this->Y.Min, this->Z.Max);
@ -183,22 +184,22 @@ struct Bounds
corners[7] = vtkm::Vec3f_64(this->X.Max, this->Y.Max, this->Z.Max);
}
/// \b Returns the max point of the bounds
/// \b Returns shortest distance to the 8 corners
///
/// \c Distance returns the Euclidean distance of the bounding box to a given point. If the bounds
/// \c Distance returns the smallest Euclidean distance between the 8 corners of a bounding box and a given point. If the bounds
/// are empty, the results are undefined.
///
VTKM_EXEC_CONT
vtkm::Float64 Distance(vtkm::Vec3f_64 point) const
{
vtkm::Vec3f_64 corners[8];
vtkm::Vec<vtkm::Vec3f_64, 8> corners;
Corners(corners);
vtkm::Float64 distance = std::numeric_limits<double>::max();
vtkm::Float64 distanceSquared = vtkm::Infinity64();
for (unsigned int p = 0; p < 8; p++)
{
distance = std::min(distance, std::sqrt(vtkm::Dot(corners[p] - point, corners[p] - point)));
distanceSquared = vtkm::Min(distanceSquared, vtkm::MagnitudeSquared(corners[p] - point));
}
return distance;
return vtkm::Sqrt(distanceSquared);
}
/// \b Expand bounds to include a point.

2
vtkm/cont/Field.h
View File

@ -16,7 +16,6 @@
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/ArrayHandleConstant.h>
#include <vtkm/cont/CastAndCall.h>
#include <vtkm/cont/UnknownArrayHandle.h>
@ -307,6 +306,7 @@ inline vtkm::cont::Field make_FieldCell(std::string name,
{
return vtkm::cont::Field(name, vtkm::cont::Field::Association::Cells, data);
}
} // namespace cont
} // namespace vtkm

1
vtkm/filter/multi_block/AmrArrays.cxx
View File

@ -227,7 +227,6 @@ void AmrArrays::ComputeGenerateGhostType()
if (!partition.HasGhostCellField())
{
ghostArrayHandle.AllocateAndFill(partition.GetNumberOfCells(), 0);
// vtkm::cont::ArrayHandleConstant<vtkm::UInt8> ghostArrayHandle = vtkm::cont::ArrayHandleConstant<vtkm::UInt8> (0, partition.GetNumberOfCells());
}
else
{