Attachment #899822 for bug #937735

View | Details | Raw Unified | Return to bug 937735
Collapse All | Expand All

Lines 11402-11408 public: Link Here

(-)a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/contour/worklet/mir/MIRTables.h (-1 / +1 lines)
11402		11402
11403	VTKM_EXEC vtkm::UInt8 GetPoint(vtkm::Id pointIndex) const	11403	VTKM_EXEC vtkm::UInt8 GetPoint(vtkm::Id pointIndex) const
11404	{	11404	{
11405	return this->CellFacePortal.Get(pointIndex);	11405	return this->CellEdgesPortal.Get(pointIndex);
11406	}	11406	}
11407		11407
11408	private:	11408	private:

Lines 136-141 Link Here

(-)a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/thirdparty/diy/vtkmdiy/include/vtkmdiy/thirdparty/chobo/small_vector.hpp (-1 / +1 lines)
136	//	136	//
137	#pragma once	137	#pragma once
138		138
		139	#include <cstdint>
139	#include <type_traits>	140	#include <type_traits>
140	#include <cstddef>	141	#include <cstddef>
141	#include <memory>	142	#include <memory>
142	-

Return to bug 937735

Lines 663-669 std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha Link Here

(-)a/ThirdParty/vtkm/vtkvtkm/vtk-m/vtkm/filter/scalar_topology/worklet/contourtree_distributed/HierarchicalContourTree.h (-2 / +2 lines)
663	auto hyperarcsPortal = this->Hyperarcs.ReadPortal();	663	auto hyperarcsPortal = this->Hyperarcs.ReadPortal();
664	auto regularNodeGlobalIdsPortal = this->RegularNodeGlobalIds.ReadPortal();	664	auto regularNodeGlobalIdsPortal = this->RegularNodeGlobalIds.ReadPortal();
665	auto whichIterationPortal = this->WhichIteration.ReadPortal();	665	auto whichIterationPortal = this->WhichIteration.ReadPortal();
666	auto whichRoundPortal = this->whichRound.ReadPortal();	666	auto whichRoundPortal = this->WhichRound.ReadPortal();
667	auto superarcsPortal = this->Superarcs.ReadPortal();	667	auto superarcsPortal = this->Superarcs.ReadPortal();
668	auto superparentsPortal = this->Superparents.ReadPortal();	668	auto superparentsPortal = this->Superparents.ReadPortal();
669	for (vtkm::Id supernode = 0; supernode < this->Supernodes.GetNumberOfValues(); supernode++)	669	for (vtkm::Id supernode = 0; supernode < this->Supernodes.GetNumberOfValues(); supernode++)
Lines 708-714 std::string HierarchicalContourTree<FieldType>::PrintDotSuperStructure(const cha Link Here
708	if (contourtree_augmented::NoSuchElement(superarcTo))	708	if (contourtree_augmented::NoSuchElement(superarcTo))
709	{ // no superarc	709	{ // no superarc
710	// if it occurred on the final round, it's the global root and is shown as the NULL node	710	// if it occurred on the final round, it's the global root and is shown as the NULL node
711	if (whichRoundPortal.Get(superarcFrom) == this->NRounds)	711	if (whichRoundPortal.Get(superarcFrom) == this->NumRounds)
712	{ // root node	712	{ // root node
713	outstream << "\tSN" << std::setw(1) << superarcFrom << " -> SA" << std::setw(1) << superarc	713	outstream << "\tSN" << std::setw(1) << superarcFrom << " -> SA" << std::setw(1) << superarc
714	<< " [label=\"S" << std::setw(1) << superarc << "\",style=dotted]\n";	714	<< " [label=\"S" << std::setw(1) << superarc << "\",style=dotted]\n";