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

remove ghosted triangles in parallel

Browse Source
This commit is contained in:
Roxana Bujack 2023-12-20 12:55:19 -07:00
parent 6666fd4ca2
commit b90c062e35
2 changed files with 94 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/rendering/Mapper.h
View File

@ -70,7 +70,7 @@ protected:
bool LogarithmX = false;
bool LogarithmY = false;
// for the volume renderer sorting back to front gives better results, which is the default
// for the volume renderer sorting back to front gives better results for transarent colors, which is the default
// but for the raytracer front to back is better.
bool SortBackToFront = true;

129
vtkm/rendering/Triangulator.h
View File

@ -19,8 +19,10 @@
#include <vtkm/rendering/raytracing/MeshConnectivityBuilder.h>
#include <vtkm/worklet/DispatcherMapField.h>
#include <vtkm/worklet/DispatcherMapTopology.h>
#include <vtkm/worklet/ScatterUniform.h>
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/WorkletMapTopology.h>
namespace vtkm
{
namespace rendering
@ -34,18 +36,51 @@ namespace rendering
class Triangulator
{
public:
struct InterleaveArrays12 : vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
using InputDomain = _1;
using ScatterType = vtkm::worklet::ScatterUniform<12>;
template <typename T>
VTKM_EXEC void operator()(const T& input, T& output) const
{
if (int(input) == 0)
output = 1;
}
};
struct InterleaveArrays2 : vtkm::worklet::WorkletMapField
{
using ControlSignature = void(FieldIn, FieldOut);
using ExecutionSignature = void(_1, _2);
using InputDomain = _1;
using ScatterType = vtkm::worklet::ScatterUniform<2>;
template <typename T>
VTKM_EXEC void operator()(const T& input, T& output) const
{
if (int(input) == 0)
output = 1;
}
};
class CountTriangles : public vtkm::worklet::WorkletVisitCellsWithPoints
{
public:
VTKM_CONT
CountTriangles() {}
using ControlSignature = void(CellSetIn cellset, FieldOut);
using ExecutionSignature = void(CellShape, _2);
using ControlSignature = void(CellSetIn cellset, FieldInCell ghostField, FieldOut triangles);
using ExecutionSignature = void(CellShape, _2, _3);
VTKM_EXEC
void operator()(vtkm::CellShapeTagGeneric shapeType, vtkm::Id& triangles) const
template <typename ghostlArrayType>
VTKM_EXEC void operator()(vtkm::CellShapeTagGeneric shapeType,
ghostlArrayType& ghostField,
vtkm::Id& triangles) const
{
if (shapeType.Id == vtkm::CELL_SHAPE_TRIANGLE)
if (int(ghostField) != 0)
triangles = 0;
else if (shapeType.Id == vtkm::CELL_SHAPE_TRIANGLE)
triangles = 1;
else if (shapeType.Id == vtkm::CELL_SHAPE_QUAD)
triangles = 2;
@ -61,21 +96,38 @@ public:
triangles = 0;
}
VTKM_EXEC
void operator()(vtkm::CellShapeTagHexahedron vtkmNotUsed(shapeType), vtkm::Id& triangles) const
template <typename ghostlArrayType>
VTKM_EXEC void operator()(vtkm::CellShapeTagHexahedron vtkmNotUsed(shapeType),
ghostlArrayType& ghostField,
vtkm::Id& triangles) const
{
triangles = 12;
if (int(ghostField) != 0)
triangles = 0;
else
triangles = 12;
}
VTKM_EXEC
void operator()(vtkm::CellShapeTagQuad vtkmNotUsed(shapeType), vtkm::Id& triangles) const
template <typename ghostlArrayType>
VTKM_EXEC void operator()(vtkm::CellShapeTagQuad vtkmNotUsed(shapeType),
ghostlArrayType& ghostField,
vtkm::Id& triangles) const
{
triangles = 2;
if (int(ghostField) != 0)
triangles = 0;
else
triangles = 2;
}
VTKM_EXEC
void operator()(vtkm::CellShapeTagWedge vtkmNotUsed(shapeType), vtkm::Id& triangles) const
template <typename ghostlArrayType>
VTKM_EXEC void operator()(vtkm::CellShapeTagWedge vtkmNotUsed(shapeType),
ghostlArrayType& ghostField,
vtkm::Id& triangles) const
{
triangles = 8;
if (int(ghostField) != 0)
triangles = 0;
else
triangles = 8;
}
}; //class CountTriangles
@ -666,6 +718,17 @@ public:
.Invoke(cellSetStructured3D, cellIdxs, outputIndices);
outputTriangles = numCells * 12;
// removed blanked triangles
vtkm::cont::ArrayHandle<vtkm::UInt8> triangleGhostArrayHandle;
triangleGhostArrayHandle.AllocateAndFill(outputTriangles, 0); //numCells * 12
vtkm::worklet::DispatcherMapField<InterleaveArrays12>(InterleaveArrays12())
.Invoke(ghostField.GetData().ExtractComponent<vtkm::UInt8>(0), triangleGhostArrayHandle);
vtkm::cont::ArrayHandle<vtkm::Id4> nonGhostTriangles;
vtkm::cont::Algorithm::CopyIf(outputIndices, triangleGhostArrayHandle, nonGhostTriangles);
outputTriangles = nonGhostTriangles.GetNumberOfValues();
outputIndices = nonGhostTriangles;
}
else if (cellset.CanConvert<vtkm::cont::CellSetStructured<2>>())
{
@ -679,6 +742,18 @@ public:
.Invoke(cellSetStructured2D, cellIdxs, outputIndices);
outputTriangles = numCells * 2;
// removed blanked triangles
vtkm::cont::ArrayHandle<vtkm::UInt8> triangleGhostArrayHandle;
triangleGhostArrayHandle.AllocateAndFill(outputTriangles, 0); //numCells * 2
vtkm::worklet::DispatcherMapField<InterleaveArrays2>(InterleaveArrays2())
.Invoke(ghostField.GetData().ExtractComponent<vtkm::UInt8>(0), triangleGhostArrayHandle);
vtkm::cont::ArrayHandle<vtkm::Id4> nonGhostTriangles;
vtkm::cont::Algorithm::CopyIf(outputIndices, triangleGhostArrayHandle, nonGhostTriangles);
outputTriangles = nonGhostTriangles.GetNumberOfValues();
outputIndices = nonGhostTriangles;
// no need to do external faces on 2D cell set
fastPath = true;
}
@ -687,8 +762,11 @@ public:
auto cellSetUnstructured =
cellset.ResetCellSetList(VTKM_DEFAULT_CELL_SET_LIST_UNSTRUCTURED{});
vtkm::cont::ArrayHandle<vtkm::Id> trianglesPerCell;
vtkm::worklet::DispatcherMapTopology<CountTriangles>(CountTriangles())
.Invoke(cellSetUnstructured, trianglesPerCell);
.Invoke(cellSetUnstructured,
ghostField.GetData().ExtractComponent<vtkm::UInt8>(0),
trianglesPerCell);
vtkm::Id totalTriangles = 0;
totalTriangles = vtkm::cont::Algorithm::Reduce(trianglesPerCell, vtkm::Id(0));
@ -703,27 +781,6 @@ public:
outputTriangles = totalTriangles;
}
// removed blanked triangles
// TODO: this currently excludes unstructured data that was triangulated
if (ghostField.GetNumberOfValues() == outputTriangles)
{
vtkm::cont::ArrayHandle<vtkm::Id4> nonGhostTriangles;
nonGhostTriangles.Allocate(outputTriangles);
vtkm::Id counter = 0;
for (vtkm::Id i = 0; i < outputTriangles; ++i)
{
if (int(ghostField.GetData().ExtractComponent<vtkm::UInt8>(0).ReadPortal().Get(
outputIndices.ReadPortal().Get(i)[0])) == 0)
{
nonGhostTriangles.WritePortal().Set(counter, outputIndices.ReadPortal().Get(i));
counter++;
}
}
nonGhostTriangles.Allocate(counter, vtkm::CopyFlag::On);
outputIndices = nonGhostTriangles;
outputTriangles = counter;
}
//get rid of any triagles we cannot see
if (!fastPath)
{