99a63f3db7
Use %conf Enable more modules with added dependencies Builds with Qt6 Drop mpich on i686 as well Re-enable PDAL Drop BR motif-devel Add patch to fix missing cstdint include Add fix for vtkm
36 lines
2.5 KiB
Diff
36 lines
2.5 KiB
Diff
diff -up VTK-9.4.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h.vtkm VTK-9.4.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h
|
|
--- VTK-9.4.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h.vtkm 2024-12-27 10:08:14.000000000 -0700
|
|
+++ VTK-9.4.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h 2025-02-17 21:40:14.880209441 -0700
|
|
@@ -663,7 +663,7 @@ std::string HierarchicalContourTree<Fiel
|
|
auto hyperarcsPortal = this->Hyperarcs.ReadPortal();
|
|
auto regularNodeGlobalIdsPortal = this->RegularNodeGlobalIds.ReadPortal();
|
|
auto whichIterationPortal = this->WhichIteration.ReadPortal();
|
|
- auto whichRoundPortal = this->whichRound.ReadPortal();
|
|
+ auto whichRoundPortal = this->WhichRound.ReadPortal();
|
|
auto superarcsPortal = this->Superarcs.ReadPortal();
|
|
auto superparentsPortal = this->Superparents.ReadPortal();
|
|
for (vtkm::Id supernode = 0; supernode < this->Supernodes.GetNumberOfValues(); supernode++)
|
|
@@ -708,7 +708,7 @@ std::string HierarchicalContourTree<Fiel
|
|
if (contourtree_augmented::NoSuchElement(superarcTo))
|
|
{ // no superarc
|
|
// if it occurred on the final round, it's the global root and is shown as the NULL node
|
|
- if (whichRoundPortal.Get(superarcFrom) == this->NRounds)
|
|
+ if (whichRoundPortal.Get(superarcFrom) == this->NumRounds)
|
|
{ // root node
|
|
outstream << "\tSN" << std::setw(1) << superarcFrom << " -> SA" << std::setw(1) << superarc
|
|
<< " [label=\"S" << std::setw(1) << superarc << "\",style=dotted]\n";
|
|
diff -up VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h.vtkm VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h
|
|
--- VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h.vtkm 2024-06-28 10:00:10.000000000 -0600
|
|
+++ VTK-9.3.1/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h 2025-02-18 07:08:33.425251429 -0700
|
|
@@ -11400,11 +11400,6 @@ public:
|
|
return FacesLookup[shape];
|
|
}
|
|
|
|
- VTKM_EXEC vtkm::UInt8 GetPoint(vtkm::Id pointIndex) const
|
|
- {
|
|
- return this->CellFacePortal.Get(pointIndex);
|
|
- }
|
|
-
|
|
private:
|
|
typename vtkm::cont::ArrayHandle<vtkm::UInt8>::ReadPortalType MIRTablesDataPortal;
|
|
typename vtkm::cont::ArrayHandle<vtkm::UInt16>::ReadPortalType MIRTablesIndicesPortal;
|