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

Support any cell type in MIR filter

Browse Source 
Previously, the MIR filter ran a check the dimensionality of the cells in
its input data set to make sure they conformed to the algorithm. The only
real reason this was necessary is because the `MeshQuality` filter can only
check the size of either area or volume, and it has to know which one to
check. However, the `CellMeasures` filter can compute the sizes of all
types of cells simultaneously (as well as more cell types). By using this
filter, the MIR filter can skip the cell type checks and support more mesh
types.
This commit is contained in:
Kenneth Moreland 2023-08-17 10:11:25 -04:00
parent 34f07c37cf
commit 8bb664de85
3 changed files with 16 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/changelog/mir-any-cell-type.md Normal file
View File

@ -0,0 +1,10 @@
# Support any cell type in MIR filter
Previously, the MIR filter ran a check the dimensionality of the cells in
its input data set to make sure they conformed to the algorithm. The only
real reason this was necessary is because the `MeshQuality` filter can only
check the size of either area or volume, and it has to know which one to
check. However, the `CellMeasures` filter can compute the sizes of all
types of cells simultaneously (as well as more cell types). By using this
filter, the MIR filter can skip the cell type checks and support more mesh
types.

41
vtkm/filter/contour/MIRFilter.cxx
View File

@ -21,18 +21,13 @@
#include <vtkm/filter/contour/MIRFilter.h>
#include <vtkm/filter/contour/worklet/MIR.h>
#include <vtkm/filter/mesh_info/MeshQuality.h>
#include <vtkm/filter/mesh_info/CellMeasures.h>
#include <vtkm/worklet/Keys.h>
#include <vtkm/worklet/ScatterCounting.h>
namespace vtkm
{
/*
Todos:
Enable some sort of cell culling, so if a cell doesn't have any work to do, it doesn't get called in future invocations of MIR
*/
namespace filter
{
namespace contour
@ -79,37 +74,13 @@ VTKM_CONT bool MIRFilter::DoMapField(
//-----------------------------------------------------------------------------
VTKM_CONT vtkm::cont::DataSet MIRFilter::DoExecute(const vtkm::cont::DataSet& input)
{
vtkm::worklet::CheckFor2D cellCheck;
vtkm::cont::ArrayHandle<vtkm::Id> count2D, count3D, countBad;
this->Invoke(cellCheck, input.GetCellSet(), count2D, count3D, countBad);
vtkm::Id c2 = vtkm::cont::Algorithm::Reduce(count2D, vtkm::Id(0));
vtkm::Id c3 = vtkm::cont::Algorithm::Reduce(count3D, vtkm::Id(0));
vtkm::Id cB = vtkm::cont::Algorithm::Reduce(countBad, vtkm::Id(0));
if (cB > vtkm::Id(0))
{
VTKM_LOG_S(
vtkm::cont::LogLevel::Fatal,
"Bad cell found in MIR filter input! Strictly only 2D -xor- 3D cell sets are permitted!");
}
if (c2 > vtkm::Id(0) && c3 > vtkm::Id(0))
{
VTKM_LOG_S(
vtkm::cont::LogLevel::Fatal,
"Bad cell mix found in MIR filter input! Input is not allowed to have both 2D and 3D cells.");
}
if (c2 == vtkm::Id(0) && c3 == vtkm::Id(0))
{
VTKM_LOG_S(vtkm::cont::LogLevel::Fatal,
"No cells found for MIR filter! Please don't call me with nothing!");
}
const vtkm::cont::CoordinateSystem inputCoords =
input.GetCoordinateSystem(this->GetActiveCoordinateSystemIndex());
vtkm::cont::ArrayHandle<vtkm::FloatDefault> avgSizeTot;
vtkm::filter::mesh_info::MeshQuality getVol(c3 > 0 ? vtkm::filter::mesh_info::CellMetric::Volume
: vtkm::filter::mesh_info::CellMetric::Area);
getVol.SetOutputFieldName("size");
vtkm::cont::ArrayCopyShallowIfPossible(getVol.Execute(input).GetCellField("size").GetData(),
vtkm::filter::mesh_info::CellMeasures getSize(
vtkm::filter::mesh_info::IntegrationType::AllMeasures);
getSize.SetCellMeasureName("size");
vtkm::cont::ArrayCopyShallowIfPossible(getSize.Execute(input).GetCellField("size").GetData(),
avgSizeTot);
// First, load up all fields...
vtkm::cont::Field or_pos = input.GetField(this->pos_name);
@ -275,7 +246,7 @@ VTKM_CONT vtkm::cont::DataSet MIRFilter::DoExecute(const vtkm::cont::DataSet& in
// Hacking workaround to not clone an entire dataset.
vtkm::cont::ArrayHandle<vtkm::FloatDefault> avgSize;
vtkm::cont::ArrayCopyShallowIfPossible(getVol.Execute(saved).GetCellField("size").GetData(),
vtkm::cont::ArrayCopyShallowIfPossible(getSize.Execute(saved).GetCellField("size").GetData(),
avgSize);
vtkm::worklet::CalcError_C calcErrC;

45
vtkm/filter/contour/worklet/MIR.h
View File

@ -2304,51 +2304,6 @@ public:
totalErrorOut = TEO(totalError);
}
};
struct CheckFor2D : public vtkm::worklet::WorkletVisitCellsWithPoints
{
using ControlSignature = void(CellSetIn,
FieldOutCell is2D,
FieldOutCell is3D,
FieldOutCell isOther);
using ExecutionSignature = void(CellShape, _2, _3, _4);
using InputDomain = _1;
template <typename OO, typename OP, typename OQ, typename SHAPE>
VTKM_EXEC void operator()(const SHAPE shape, OO& is2D, OP& is3D, OQ& isOther) const
{
is2D = vtkm::Id(0);
is3D = vtkm::Id(0);
if (shape.Id == vtkm::CellShapeIdToTag<vtkm::CELL_SHAPE_TRIANGLE>::Tag().Id ||
shape.Id == vtkm::CellShapeIdToTag<vtkm::CELL_SHAPE_POLYGON>::Tag().Id ||
shape.Id == vtkm::CellShapeIdToTag<vtkm::CELL_SHAPE_QUAD>::Tag().Id ||
shape.Id == vtkm::Id(6) // Tri strip?
|| shape.Id == vtkm::Id(8) /* Pixel? */)
{
is2D = vtkm::Id(1);
}
else if (shape.Id == vtkm::Id(0) /*Empty*/
|| shape.Id == vtkm::CellShapeIdToTag<vtkm::CELL_SHAPE_LINE>::Tag().Id ||
shape.Id == vtkm::CellShapeIdToTag<vtkm::CELL_SHAPE_POLY_LINE>::Tag().Id ||
shape.Id == vtkm::CellShapeIdToTag<vtkm::CELL_SHAPE_VERTEX>::Tag().Id ||
shape.Id == vtkm::Id(2) /* Poly Vertex? */)
{
isOther = vtkm::Id(1);
}
else if (shape.Id == vtkm::CellShapeIdToTag<vtkm::CELL_SHAPE_TETRA>::Tag().Id ||
shape.Id == vtkm::CellShapeIdToTag<vtkm::CELL_SHAPE_HEXAHEDRON>::Tag().Id ||
shape.Id == vtkm::CellShapeIdToTag<vtkm::CELL_SHAPE_WEDGE>::Tag().Id ||
shape.Id == vtkm::CellShapeIdToTag<vtkm::CELL_SHAPE_PYRAMID>::Tag().Id ||
shape.Id == vtkm::Id(11) /* Voxel? */)
{
is3D = vtkm::Id(1);
}
else
{
// Truly is other
isOther = vtkm::Id(1);
}
}
};
struct ConstructCellWeightList : public vtkm::worklet::WorkletMapField
{