Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 18:45:43 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'rename-ghost-cell-classification'

Browse Source 
b81b2f817 Make CellClassification more clear

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !1597
This commit is contained in:
Kenneth Moreland 2019-03-23 16:38:35 +00:00 committed by Kitware Robot
commit b8d9040a39
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/CMakeLists.txt
View File

@ -33,11 +33,11 @@ set(headers
BinaryOperators.h
Bitset.h
Bounds.h
CellClassification.h
CellShape.h
CellTraits.h
Flags.h
Geometry.h
GhostCell.h
Hash.h
ImplicitFunction.h
ListTag.h

12
vtkm/GhostCell.h → vtkm/CellClassification.h
View File

@ -17,17 +17,17 @@
// Laboratory (LANL), the U.S. Government retains certain rights in
// this software.
//============================================================================
#ifndef vtk_m_Ghost_Cell_h
#define vtk_m_Ghost_Cell_h
#ifndef vtk_m_CellClassification_h
#define vtk_m_CellClassification_h
namespace vtkm
{
enum struct CellClassification
{
NORMAL = 0, //Valid cell
DUPLICATE = 1 << 0, //Ghost cell
INVALID = 1 << 1, //Cell is invalid
NORMAL = 0, //Valid cell
GHOST = 1 << 0, //Ghost cell
INVALID = 1 << 1, //Cell is invalid
UNUSED0 = 1 << 2,
UNUSED1 = 1 << 3,
UNUSED3 = 1 << 4,
@ -36,4 +36,4 @@ enum struct CellClassification
};
}
#endif // vtk_m_Ghost_Cell_h
#endif // vtk_m_CellClassification_h

8
vtkm/filter/AddGhostZone.hxx
View File

@ -18,7 +18,7 @@
// this software.
//============================================================================
#include <vtkm/GhostCell.h>
#include <vtkm/CellClassification.h>
#include <vtkm/RangeId.h>
#include <vtkm/RangeId2.h>
#include <vtkm/RangeId3.h>
@ -62,7 +62,7 @@ private:
static constexpr vtkm::UInt8 NormalCell =
static_cast<vtkm::UInt8>(vtkm::CellClassification::NORMAL);
static constexpr vtkm::UInt8 DuplicateCell =
static_cast<vtkm::UInt8>(vtkm::CellClassification::DUPLICATE);
static_cast<vtkm::UInt8>(vtkm::CellClassification::GHOST);
};
class SetStructuredGhostZones2D : public vtkm::worklet::WorkletMapField
@ -93,7 +93,7 @@ private:
static constexpr vtkm::UInt8 NormalCell =
static_cast<vtkm::UInt8>(vtkm::CellClassification::NORMAL);
static constexpr vtkm::UInt8 DuplicateCell =
static_cast<vtkm::UInt8>(vtkm::CellClassification::DUPLICATE);
static_cast<vtkm::UInt8>(vtkm::CellClassification::GHOST);
};
class SetStructuredGhostZones3D : public vtkm::worklet::WorkletMapField
@ -130,7 +130,7 @@ private:
static constexpr vtkm::UInt8 NormalCell =
static_cast<vtkm::UInt8>(vtkm::CellClassification::NORMAL);
static constexpr vtkm::UInt8 DuplicateCell =
static_cast<vtkm::UInt8>(vtkm::CellClassification::DUPLICATE);
static_cast<vtkm::UInt8>(vtkm::CellClassification::GHOST);
};
};

2
vtkm/filter/GhostZone.h
View File

@ -21,7 +21,7 @@
#ifndef vtk_m_filter_GhostZone_h
#define vtk_m_filter_GhostZone_h
#include <vtkm/GhostCell.h>
#include <vtkm/CellClassification.h>
#include <vtkm/filter/FilterDataSetWithField.h>
#include <vtkm/filter/Threshold.h>

4
vtkm/filter/testing/UnitTestGhostZone.cxx
View File

@ -44,7 +44,7 @@ static vtkm::cont::ArrayHandle<vtkm::UInt8> StructuredGhostZoneArray(vtkm::Id nx
numCells *= nz;
vtkm::UInt8 normalCell = static_cast<vtkm::UInt8>(vtkm::CellClassification::NORMAL);
vtkm::UInt8 duplicateCell = static_cast<vtkm::UInt8>(vtkm::CellClassification::DUPLICATE);
vtkm::UInt8 duplicateCell = static_cast<vtkm::UInt8>(vtkm::CellClassification::GHOST);
vtkm::cont::ArrayHandle<vtkm::UInt8> ghosts;
ghosts.Allocate(numCells);
@ -272,7 +272,7 @@ void TestGhostZone()
ghostZoneRemoval.RemoveAllGhost();
else if (rt == "byType")
ghostZoneRemoval.RemoveByType(
static_cast<vtkm::UInt8>(vtkm::CellClassification::DUPLICATE));
static_cast<vtkm::UInt8>(vtkm::CellClassification::GHOST));
std::vector<std::string> outputType = { "permutation", "explicit" };
for (auto& ot : outputType)