mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
Fix spelling error of canonical
It was being spelled cononical.
This commit is contained in:
parent
c59a227a61
commit
16e4e6079c
@ -355,14 +355,14 @@ static inline VTKM_EXEC vtkm::Vec<vtkm::IdComponent, 2> CellEdgeLocalIndices(
|
||||
}
|
||||
}
|
||||
|
||||
/// \brief Returns a cononical identifier for a cell edge
|
||||
/// \brief Returns a canonical identifier for a cell edge
|
||||
///
|
||||
/// Given information about a cell edge and the global point indices for that cell, returns a
|
||||
/// vtkm::Id2 that contains values that are unique to that edge. The values for two edges will be
|
||||
/// the same if and only if the edges contain the same points.
|
||||
///
|
||||
template <typename CellShapeTag, typename GlobalPointIndicesVecType>
|
||||
static inline VTKM_EXEC vtkm::Id2 CellEdgeCononicalId(
|
||||
static inline VTKM_EXEC vtkm::Id2 CellEdgeCanonicalId(
|
||||
vtkm::IdComponent numPoints,
|
||||
vtkm::IdComponent edgeIndex,
|
||||
CellShapeTag shape,
|
||||
|
@ -246,7 +246,7 @@ static inline VTKM_EXEC vtkm::VecCConst<vtkm::IdComponent> CellFaceLocalIndices(
|
||||
return vtkm::make_VecC(detail::PointsInFace[shape.Id][faceIndex], numPointsInFace);
|
||||
}
|
||||
|
||||
/// \brief Returns a cononical identifer for a cell face
|
||||
/// \brief Returns a canonical identifer for a cell face
|
||||
///
|
||||
/// Given information about a cell face and the global point indices for that cell, returns a
|
||||
/// vtkm::Id3 that contains values that are unique to that face. The values for two faces will be
|
||||
@ -257,7 +257,7 @@ static inline VTKM_EXEC vtkm::VecCConst<vtkm::IdComponent> CellFaceLocalIndices(
|
||||
/// than a single point or single edge.
|
||||
///
|
||||
template <typename CellShapeTag, typename GlobalPointIndicesVecType>
|
||||
static inline VTKM_EXEC vtkm::Id3 CellFaceCononicalId(
|
||||
static inline VTKM_EXEC vtkm::Id3 CellFaceCanonicalId(
|
||||
vtkm::IdComponent faceIndex,
|
||||
CellShapeTag shape,
|
||||
const GlobalPointIndicesVecType& globalPointIndicesVec,
|
||||
|
@ -36,7 +36,7 @@ namespace
|
||||
|
||||
using EdgeType = vtkm::Vec<vtkm::IdComponent, 2>;
|
||||
|
||||
void MakeEdgeCononical(EdgeType& edge)
|
||||
void MakeEdgeCanonical(EdgeType& edge)
|
||||
{
|
||||
if (edge[1] < edge[0])
|
||||
{
|
||||
@ -77,15 +77,15 @@ struct TestCellFacesFunctor
|
||||
VTKM_TEST_ASSERT(edge[1] >= 0, "Bad index in edge.");
|
||||
VTKM_TEST_ASSERT(edge[1] < numPoints, "Bad index in edge.");
|
||||
VTKM_TEST_ASSERT(edge[0] != edge[1], "Degenerate edge.");
|
||||
MakeEdgeCononical(edge);
|
||||
VTKM_TEST_ASSERT(edge[0] < edge[1], "Internal test error: MakeEdgeCononical failed");
|
||||
MakeEdgeCanonical(edge);
|
||||
VTKM_TEST_ASSERT(edge[0] < edge[1], "Internal test error: MakeEdgeCanonical failed");
|
||||
VTKM_TEST_ASSERT(edgeSet.find(edge) == edgeSet.end(), "Found duplicate edge");
|
||||
edgeSet.insert(edge);
|
||||
|
||||
vtkm::Id2 cononicalEdgeId =
|
||||
vtkm::exec::CellEdgeCononicalId(numPoints, edgeIndex, shape, pointIndexProxy, workletProxy);
|
||||
VTKM_TEST_ASSERT(cononicalEdgeId[0] > 0, "Not using global ids?");
|
||||
VTKM_TEST_ASSERT(cononicalEdgeId[0] < cononicalEdgeId[1], "Bad order.");
|
||||
vtkm::Id2 canonicalEdgeId =
|
||||
vtkm::exec::CellEdgeCanonicalId(numPoints, edgeIndex, shape, pointIndexProxy, workletProxy);
|
||||
VTKM_TEST_ASSERT(canonicalEdgeId[0] > 0, "Not using global ids?");
|
||||
VTKM_TEST_ASSERT(canonicalEdgeId[0] < canonicalEdgeId[1], "Bad order.");
|
||||
}
|
||||
|
||||
vtkm::IdComponent numFaces = vtkm::exec::CellFaceNumberOfFaces(shape, workletProxy);
|
||||
@ -112,16 +112,16 @@ struct TestCellFacesFunctor
|
||||
{
|
||||
edge = EdgeType(facePoints[0], facePoints[pointIndex]);
|
||||
}
|
||||
MakeEdgeCononical(edge);
|
||||
MakeEdgeCanonical(edge);
|
||||
VTKM_TEST_ASSERT(edgeSet.find(edge) != edgeSet.end(), "Edge in face not in cell's edges");
|
||||
edgesFoundInFaces.insert(edge);
|
||||
}
|
||||
|
||||
vtkm::Id3 cononicalFaceId =
|
||||
vtkm::exec::CellFaceCononicalId(faceIndex, shape, pointIndexProxy, workletProxy);
|
||||
VTKM_TEST_ASSERT(cononicalFaceId[0] > 0, "Not using global ids?");
|
||||
VTKM_TEST_ASSERT(cononicalFaceId[0] < cononicalFaceId[1], "Bad order.");
|
||||
VTKM_TEST_ASSERT(cononicalFaceId[1] < cononicalFaceId[2], "Bad order.");
|
||||
vtkm::Id3 canonicalFaceId =
|
||||
vtkm::exec::CellFaceCanonicalId(faceIndex, shape, pointIndexProxy, workletProxy);
|
||||
VTKM_TEST_ASSERT(canonicalFaceId[0] > 0, "Not using global ids?");
|
||||
VTKM_TEST_ASSERT(canonicalFaceId[0] < canonicalFaceId[1], "Bad order.");
|
||||
VTKM_TEST_ASSERT(canonicalFaceId[1] < canonicalFaceId[2], "Bad order.");
|
||||
}
|
||||
VTKM_TEST_ASSERT(edgesFoundInFaces.size() == edgeSet.size(),
|
||||
"Faces did not contain all edges in cell");
|
||||
@ -159,15 +159,15 @@ struct TestCellFacesFunctor
|
||||
VTKM_TEST_ASSERT(edge[1] >= 0, "Bad index in edge.");
|
||||
VTKM_TEST_ASSERT(edge[1] < numPoints, "Bad index in edge.");
|
||||
VTKM_TEST_ASSERT(edge[0] != edge[1], "Degenerate edge.");
|
||||
MakeEdgeCononical(edge);
|
||||
VTKM_TEST_ASSERT(edge[0] < edge[1], "Internal test error: MakeEdgeCononical failed");
|
||||
MakeEdgeCanonical(edge);
|
||||
VTKM_TEST_ASSERT(edge[0] < edge[1], "Internal test error: MakeEdgeCanonical failed");
|
||||
VTKM_TEST_ASSERT(edgeSet.find(edge) == edgeSet.end(), "Found duplicate edge");
|
||||
edgeSet.insert(edge);
|
||||
|
||||
vtkm::Id2 cononicalEdgeId =
|
||||
vtkm::exec::CellEdgeCononicalId(numPoints, edgeIndex, shape, pointIndexProxy, workletProxy);
|
||||
VTKM_TEST_ASSERT(cononicalEdgeId[0] > 0, "Not using global ids?");
|
||||
VTKM_TEST_ASSERT(cononicalEdgeId[0] < cononicalEdgeId[1], "Bad order.");
|
||||
vtkm::Id2 canonicalEdgeId =
|
||||
vtkm::exec::CellEdgeCanonicalId(numPoints, edgeIndex, shape, pointIndexProxy, workletProxy);
|
||||
VTKM_TEST_ASSERT(canonicalEdgeId[0] > 0, "Not using global ids?");
|
||||
VTKM_TEST_ASSERT(canonicalEdgeId[0] < canonicalEdgeId[1], "Bad order.");
|
||||
}
|
||||
|
||||
vtkm::IdComponent numFaces = vtkm::exec::CellFaceNumberOfFaces(shape, workletProxy);
|
||||
|
@ -380,7 +380,7 @@ struct ExternalFaces
|
||||
vtkm::Id inputIndex,
|
||||
vtkm::IdComponent visitIndex) const
|
||||
{
|
||||
faceHash = vtkm::Hash(vtkm::exec::CellFaceCononicalId(visitIndex, shape, cellNodeIds, *this));
|
||||
faceHash = vtkm::Hash(vtkm::exec::CellFaceCanonicalId(visitIndex, shape, cellNodeIds, *this));
|
||||
|
||||
cellIndex = inputIndex;
|
||||
faceIndex = visitIndex;
|
||||
@ -422,14 +422,14 @@ struct ExternalFaces
|
||||
myIndex++)
|
||||
{
|
||||
vtkm::Id3 myFace =
|
||||
vtkm::exec::CellFaceCononicalId(originFaces[myIndex],
|
||||
vtkm::exec::CellFaceCanonicalId(originFaces[myIndex],
|
||||
cellSet.GetCellShape(originCells[myIndex]),
|
||||
cellSet.GetIndices(originCells[myIndex]),
|
||||
*this);
|
||||
for (vtkm::IdComponent otherIndex = myIndex + 1; otherIndex < numCellsOnHash; otherIndex++)
|
||||
{
|
||||
vtkm::Id3 otherFace =
|
||||
vtkm::exec::CellFaceCononicalId(originFaces[otherIndex],
|
||||
vtkm::exec::CellFaceCanonicalId(originFaces[otherIndex],
|
||||
cellSet.GetCellShape(originCells[otherIndex]),
|
||||
cellSet.GetIndices(originCells[otherIndex]),
|
||||
*this);
|
||||
@ -470,7 +470,7 @@ private:
|
||||
while (true)
|
||||
{
|
||||
VTKM_ASSERT(myIndex < numCellsOnHash);
|
||||
vtkm::Id3 myFace = vtkm::exec::CellFaceCononicalId(originFaces[myIndex],
|
||||
vtkm::Id3 myFace = vtkm::exec::CellFaceCanonicalId(originFaces[myIndex],
|
||||
cellSet.GetCellShape(originCells[myIndex]),
|
||||
cellSet.GetIndices(originCells[myIndex]),
|
||||
*self);
|
||||
@ -478,7 +478,7 @@ private:
|
||||
for (vtkm::IdComponent otherIndex = myIndex + 1; otherIndex < numCellsOnHash; otherIndex++)
|
||||
{
|
||||
vtkm::Id3 otherFace =
|
||||
vtkm::exec::CellFaceCononicalId(originFaces[otherIndex],
|
||||
vtkm::exec::CellFaceCanonicalId(originFaces[otherIndex],
|
||||
cellSet.GetCellShape(originCells[otherIndex]),
|
||||
cellSet.GetIndices(originCells[otherIndex]),
|
||||
*self);
|
||||
|
Loading…
Reference in New Issue
Block a user