mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-08 13:23:51 +00:00
Add CellFace functions
These provide the general ability to get the faces for each cell type.
This commit is contained in:
Kenneth Moreland
parent
b76280c849
commit
5ab43f8d9e
@ -21,6 +21,7 @@
|
||||
set(headers
|
||||
AtomicArray.h
|
||||
CellDerivative.h
|
||||
CellFace.h
|
||||
CellInterpolate.h
|
||||
ConnectivityExplicit.h
|
||||
ConnectivityPermuted.h
|
||||
|
||||
238
vtkm/exec/CellFace.h
Normal file
238
vtkm/exec/CellFace.h
Normal file
@ -0,0 +1,238 @@
|
||||
//============================================================================
|
||||
// Copyright (c) Kitware, Inc.
|
||||
// All rights reserved.
|
||||
// See LICENSE.txt for details.
|
||||
// This software is distributed WITHOUT ANY WARRANTY; without even
|
||||
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
// PURPOSE. See the above copyright notice for more information.
|
||||
//
|
||||
// Copyright 2016 Sandia Corporation.
|
||||
// Copyright 2016 UT-Battelle, LLC.
|
||||
// Copyright 2016 Los Alamos National Security.
|
||||
//
|
||||
// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
|
||||
// the U.S. Government retains certain rights in this software.
|
||||
//
|
||||
// Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
|
||||
// Laboratory (LANL), the U.S. Government retains certain rights in
|
||||
// this software.
|
||||
//============================================================================
|
||||
#ifndef vtk_m_exec_CellFace_h
|
||||
#define vtk_m_exec_CellFace_h
|
||||
|
||||
#include <vtkm/Assert.h>
|
||||
#include <vtkm/CellShape.h>
|
||||
#include <vtkm/Types.h>
|
||||
#include <vtkm/internal/Assume.h>
|
||||
#include <vtkm/exec/FunctorBase.h>
|
||||
|
||||
namespace vtkm {
|
||||
namespace exec {
|
||||
|
||||
namespace detail {
|
||||
|
||||
static const vtkm::IdComponent MAX_FACE_SIZE = 4;
|
||||
static const vtkm::IdComponent MAX_NUM_FACES = 6;
|
||||
|
||||
VTKM_EXEC_CONSTANT
|
||||
static const vtkm::IdComponent NumFaces[vtkm::NUMBER_OF_CELL_SHAPES] = {
|
||||
0, // 0: CELL_SHAPE_EMPTY
|
||||
0, // 1: CELL_SHAPE_VERTEX
|
||||
0, // 2: Unused
|
||||
0, // 3: CELL_SHAPE_LINE
|
||||
0, // 4: Unused
|
||||
0, // 5: CELL_SHAPE_TRIANGLE
|
||||
0, // 6: Unused
|
||||
0, // 7: CELL_SHAPE_POLYGON
|
||||
0, // 8: Unused
|
||||
0, // 9: CELL_SHAPE_QUAD
|
||||
4, // 10: CELL_SHAPE_TETRA
|
||||
0, // 11: Unused
|
||||
6, // 12: CELL_SHAPE_HEXAHEDRON
|
||||
5, // 13: CELL_SHAPE_WEDGE
|
||||
5 // 14: CELL_SHAPE_PYRAMID
|
||||
};
|
||||
|
||||
VTKM_EXEC_CONSTANT
|
||||
static const vtkm::IdComponent
|
||||
NumPointsInFace[vtkm::NUMBER_OF_CELL_SHAPES][MAX_NUM_FACES] = {
|
||||
{ -1, -1, -1, -1, -1, -1}, // 0: CELL_SHAPE_EMPTY
|
||||
{ -1, -1, -1, -1, -1, -1}, // 1: CELL_SHAPE_VERTEX
|
||||
{ -1, -1, -1, -1, -1, -1}, // 2: Unused
|
||||
{ -1, -1, -1, -1, -1, -1}, // 3: CELL_SHAPE_LINE
|
||||
{ -1, -1, -1, -1, -1, -1}, // 4: Unused
|
||||
{ -1, -1, -1, -1, -1, -1}, // 5: CELL_SHAPE_TRIANGLE
|
||||
{ -1, -1, -1, -1, -1, -1}, // 6: Unused
|
||||
{ -1, -1, -1, -1, -1, -1}, // 7: CELL_SHAPE_POLYGON
|
||||
{ -1, -1, -1, -1, -1, -1}, // 8: Unused
|
||||
{ -1, -1, -1, -1, -1, -1}, // 9: CELL_SHAPE_QUAD
|
||||
{ 3, 3, 3, 3, -1, -1}, // 10: CELL_SHAPE_TETRA
|
||||
{ -1, -1, -1, -1, -1, -1}, // 11: Unused
|
||||
{ 4, 4, 4, 4, 4, 4}, // 12: CELL_SHAPE_HEXAHEDRON
|
||||
{ 3, 3, 4, 4, 4, -1}, // 13: CELL_SHAPE_WEDGE
|
||||
{ 4, 3, 3, 3, 3, -1} // 14: CELL_SHAPE_PYRAMID
|
||||
};
|
||||
|
||||
VTKM_EXEC_CONSTANT
|
||||
static const vtkm::IdComponent
|
||||
PointsInFace[vtkm::NUMBER_OF_CELL_SHAPES][MAX_NUM_FACES][MAX_FACE_SIZE] = {
|
||||
// 0: CELL_SHAPE_EMPTY
|
||||
{ { -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 1: CELL_SHAPE_VERTEX
|
||||
{ { -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 2: Unused
|
||||
{ { -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 3: CELL_SHAPE_LINE
|
||||
{ { -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 4: Unused
|
||||
{ { -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 5: CELL_SHAPE_TRIANGLE
|
||||
{ { -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 6: Unused
|
||||
{ { -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 7: CELL_SHAPE_POLYGON
|
||||
{ { -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 8: Unused
|
||||
{ { -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 9: CELL_SHAPE_QUAD
|
||||
{ { -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 10: CELL_SHAPE_TETRA
|
||||
{ { 0, 1, 3, -1 },
|
||||
{ 1, 2, 3, -1 },
|
||||
{ 2, 0, 3, -1 },
|
||||
{ 0, 2, 1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 11: Unused
|
||||
{ { -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 12: CELL_SHAPE_HEXAHEDRON
|
||||
{ { 0, 4, 7, 3 },
|
||||
{ 1, 2, 6, 5 },
|
||||
{ 0, 1, 5, 4 },
|
||||
{ 3, 7, 6, 2 },
|
||||
{ 0, 3, 2, 1 },
|
||||
{ 4, 5, 6, 7 } },
|
||||
// 13: CELL_SHAPE_WEDGE
|
||||
{ { 0, 1, 2, -1 },
|
||||
{ 3, 5, 4, -1 },
|
||||
{ 0, 3, 4, 1 },
|
||||
{ 1, 4, 5, 2 },
|
||||
{ 2, 5, 3, 0 },
|
||||
{ -1, -1, -1, -1 } },
|
||||
// 14: CELL_SHAPE_PYRAMID
|
||||
{ { 0, 3, 2, 1 },
|
||||
{ 0, 1, 4, -1 },
|
||||
{ 1, 2, 4, -1 },
|
||||
{ 2, 3, 4, -1 },
|
||||
{ 3, 0, 4, -1 },
|
||||
{ -1, -1, -1, -1 } }
|
||||
};
|
||||
|
||||
} // namespace detail
|
||||
|
||||
template<typename CellShapeTag>
|
||||
static inline VTKM_EXEC
|
||||
vtkm::IdComponent
|
||||
CellFaceNumberOfFaces(CellShapeTag shape,
|
||||
const vtkm::exec::FunctorBase &)
|
||||
{
|
||||
return detail::NumFaces[shape.Id];
|
||||
}
|
||||
|
||||
template<typename CellShapeTag>
|
||||
static inline VTKM_EXEC
|
||||
vtkm::IdComponent
|
||||
CellFaceNumberOfPoints(vtkm::IdComponent faceIndex,
|
||||
CellShapeTag shape,
|
||||
const vtkm::exec::FunctorBase &worklet)
|
||||
{
|
||||
VTKM_ASSUME(faceIndex >= 0);
|
||||
VTKM_ASSUME(faceIndex < detail::MAX_NUM_FACES);
|
||||
if (faceIndex >= vtkm::exec::CellFaceNumberOfFaces(shape, worklet))
|
||||
{
|
||||
worklet.RaiseError("Invalid face number.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
return detail::NumPointsInFace[shape.Id][faceIndex];
|
||||
}
|
||||
|
||||
template<typename CellShapeTag>
|
||||
static inline VTKM_EXEC
|
||||
vtkm::VecCConst<vtkm::IdComponent>
|
||||
CellFaceLocalIndices(vtkm::IdComponent faceIndex,
|
||||
CellShapeTag shape,
|
||||
const vtkm::exec::FunctorBase &worklet)
|
||||
{
|
||||
vtkm::IdComponent numPointsInFace =
|
||||
vtkm::exec::CellFaceNumberOfPoints(faceIndex, shape, worklet);
|
||||
if (numPointsInFace < 1)
|
||||
{
|
||||
// An invalid face. We should already have gotten an error from
|
||||
// CellFaceNumberOfPoints.
|
||||
return vtkm::VecCConst<vtkm::IdComponent>();
|
||||
}
|
||||
|
||||
return vtkm::make_VecC(detail::PointsInFace[shape.Id][faceIndex],
|
||||
numPointsInFace);
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace vtkm::exec
|
||||
|
||||
#endif //vtk_m_exec_CellFace_h
|
||||
@ -22,6 +22,7 @@
|
||||
|
||||
set(unit_tests
|
||||
UnitTestCellDerivative.cxx
|
||||
UnitTestCellFace.cxx
|
||||
UnitTestCellInterpolate.cxx
|
||||
UnitTestParametricCoordinates.cxx
|
||||
)
|
||||
|
||||
115
vtkm/exec/testing/UnitTestCellFace.cxx
Normal file
115
vtkm/exec/testing/UnitTestCellFace.cxx
Normal file
@ -0,0 +1,115 @@
|
||||
//============================================================================
|
||||
// Copyright (c) Kitware, Inc.
|
||||
// All rights reserved.
|
||||
// See LICENSE.txt for details.
|
||||
// This software is distributed WITHOUT ANY WARRANTY; without even
|
||||
// the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
// PURPOSE. See the above copyright notice for more information.
|
||||
//
|
||||
// Copyright 2016 Sandia Corporation.
|
||||
// Copyright 2016 UT-Battelle, LLC.
|
||||
// Copyright 2016 Los Alamos National Security.
|
||||
//
|
||||
// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
|
||||
// the U.S. Government retains certain rights in this software.
|
||||
//
|
||||
// Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
|
||||
// Laboratory (LANL), the U.S. Government retains certain rights in
|
||||
// this software.
|
||||
//============================================================================
|
||||
|
||||
#include <vtkm/exec/CellFace.h>
|
||||
|
||||
#include <vtkm/CellShape.h>
|
||||
#include <vtkm/CellTraits.h>
|
||||
|
||||
#include <vtkm/exec/FunctorBase.h>
|
||||
|
||||
#include <vtkm/testing/Testing.h>
|
||||
|
||||
namespace {
|
||||
|
||||
struct TestCellFacesFunctor
|
||||
{
|
||||
template<typename CellShapeTag>
|
||||
void DoTest(CellShapeTag shape,
|
||||
vtkm::CellTopologicalDimensionsTag<3>) const
|
||||
{
|
||||
// Stuff to fake running in the execution environment.
|
||||
char messageBuffer[256];
|
||||
messageBuffer[0] = '\0';
|
||||
vtkm::exec::internal::ErrorMessageBuffer errorMessage(messageBuffer, 256);
|
||||
vtkm::exec::FunctorBase workletProxy;
|
||||
workletProxy.SetErrorMessageBuffer(errorMessage);
|
||||
|
||||
vtkm::IdComponent numFaces =
|
||||
vtkm::exec::CellFaceNumberOfFaces(shape, workletProxy);
|
||||
VTKM_TEST_ASSERT(numFaces > 0, "No faces?");
|
||||
|
||||
for (vtkm::IdComponent faceIndex = 0; faceIndex < numFaces; faceIndex++)
|
||||
{
|
||||
vtkm::VecCConst<vtkm::IdComponent> facePoints =
|
||||
vtkm::exec::CellFaceLocalIndices(faceIndex, shape, workletProxy);
|
||||
vtkm::IdComponent numPointsInFace = facePoints.GetNumberOfComponents();
|
||||
VTKM_TEST_ASSERT(numPointsInFace >= 3,
|
||||
"Face has fewer points than a triangle.");
|
||||
// Currently no face has more than 5 points
|
||||
VTKM_TEST_ASSERT(numPointsInFace <= 5,
|
||||
"Face has too many points.");
|
||||
|
||||
for (vtkm::IdComponent pointIndex = 0;
|
||||
pointIndex < numPointsInFace;
|
||||
pointIndex++)
|
||||
{
|
||||
VTKM_TEST_ASSERT(facePoints[pointIndex] >= 0,
|
||||
"Invalid point index for face.");
|
||||
// Currently no cell has more than 10 points
|
||||
VTKM_TEST_ASSERT(facePoints[pointIndex] <= 10,
|
||||
"Invalid point index for face.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Less important case of cells that have less than 3 dimensions (no faces)
|
||||
template<typename CellShapeTag, vtkm::IdComponent NumDimensions>
|
||||
void DoTest(CellShapeTag shape,
|
||||
vtkm::CellTopologicalDimensionsTag<NumDimensions>) const
|
||||
{
|
||||
// Stuff to fake running in the execution environment.
|
||||
char messageBuffer[256];
|
||||
messageBuffer[0] = '\0';
|
||||
vtkm::exec::internal::ErrorMessageBuffer errorMessage(messageBuffer, 256);
|
||||
vtkm::exec::FunctorBase workletProxy;
|
||||
workletProxy.SetErrorMessageBuffer(errorMessage);
|
||||
|
||||
vtkm::IdComponent numFaces =
|
||||
vtkm::exec::CellFaceNumberOfFaces(shape, workletProxy);
|
||||
VTKM_TEST_ASSERT(numFaces == 0, "Non 3D shape should have no faces");
|
||||
}
|
||||
|
||||
template<typename CellShapeTag>
|
||||
void operator()(CellShapeTag) const
|
||||
{
|
||||
std::cout << "--- Test shape tag directly" << std::endl;
|
||||
this->DoTest(
|
||||
CellShapeTag(),
|
||||
typename vtkm::CellTraits<CellShapeTag>::TopologicalDimensionsTag());
|
||||
|
||||
std::cout << "--- Test generic shape tag" << std::endl;
|
||||
this->DoTest(
|
||||
vtkm::CellShapeTagGeneric(CellShapeTag::Id),
|
||||
typename vtkm::CellTraits<CellShapeTag>::TopologicalDimensionsTag());
|
||||
}
|
||||
};
|
||||
|
||||
void TestAllShapes()
|
||||
{
|
||||
vtkm::testing::Testing::TryAllCellShapes(TestCellFacesFunctor());
|
||||
}
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
int UnitTestCellFace(int, char *[])
|
||||
{
|
||||
return vtkm::testing::Testing::Run(TestAllShapes);
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user