diff --git a/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx b/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx index f1aa27f25..a953e57f6 100644 --- a/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx +++ b/vtkm/cont/testing/UnitTestDataSetRectilinear.cxx @@ -92,7 +92,7 @@ static void TwoDimRectilinearTest() vtkm::Id cells[2][4] = { { 0, 1, 4, 3 }, { 1, 2, 5, 4 } }; for (vtkm::Id cellIndex = 0; cellIndex < 2; cellIndex++) { - vtkm::Id4 pointIds = pointToCell.GetIndices(pointToCell.FlatToLogicalToIndex(cellIndex)); + vtkm::Id4 pointIds = pointToCell.GetIndices(pointToCell.FlatToLogicalVisitIndex(cellIndex)); for (vtkm::IdComponent localPointIndex = 0; localPointIndex < 4; localPointIndex++) { VTKM_TEST_ASSERT(pointIds[localPointIndex] == cells[cellIndex][localPointIndex], @@ -106,7 +106,7 @@ static void TwoDimRectilinearTest() for (vtkm::Id pointIndex = 0; pointIndex < 6; pointIndex++) { vtkm::VecVariable retrievedCellIds = - cellToPoint.GetIndices(cellToPoint.FlatToLogicalToIndex(pointIndex)); + cellToPoint.GetIndices(cellToPoint.FlatToLogicalVisitIndex(pointIndex)); VTKM_TEST_ASSERT(retrievedCellIds.GetNumberOfComponents() <= 4, "Got wrong number of cell ids."); for (vtkm::IdComponent cellIndex = 0; cellIndex < retrievedCellIds.GetNumberOfComponents(); diff --git a/vtkm/cont/testing/UnitTestDataSetUniform.cxx b/vtkm/cont/testing/UnitTestDataSetUniform.cxx index ff400c015..3f0c57929 100644 --- a/vtkm/cont/testing/UnitTestDataSetUniform.cxx +++ b/vtkm/cont/testing/UnitTestDataSetUniform.cxx @@ -94,7 +94,7 @@ static void TwoDimUniformTest() vtkm::Id cells[2][4] = { { 0, 1, 4, 3 }, { 1, 2, 5, 4 } }; for (vtkm::Id cellIndex = 0; cellIndex < 2; cellIndex++) { - vtkm::Id4 pointIds = pointToCell.GetIndices(pointToCell.FlatToLogicalToIndex(cellIndex)); + vtkm::Id4 pointIds = pointToCell.GetIndices(pointToCell.FlatToLogicalVisitIndex(cellIndex)); for (vtkm::IdComponent localPointIndex = 0; localPointIndex < 4; localPointIndex++) { VTKM_TEST_ASSERT(pointIds[localPointIndex] == cells[cellIndex][localPointIndex], @@ -108,7 +108,7 @@ static void TwoDimUniformTest() for (vtkm::Id pointIndex = 0; pointIndex < 6; pointIndex++) { vtkm::VecVariable retrievedCellIds = - cellToPoint.GetIndices(cellToPoint.FlatToLogicalToIndex(pointIndex)); + cellToPoint.GetIndices(cellToPoint.FlatToLogicalVisitIndex(pointIndex)); VTKM_TEST_ASSERT(retrievedCellIds.GetNumberOfComponents() <= 4, "Got wrong number of cell ids."); for (vtkm::IdComponent cellIndex = 0; cellIndex < retrievedCellIds.GetNumberOfComponents(); diff --git a/vtkm/exec/ConnectivityStructured.h b/vtkm/exec/ConnectivityStructured.h index 0f14923c3..fd3fce942 100644 --- a/vtkm/exec/ConnectivityStructured.h +++ b/vtkm/exec/ConnectivityStructured.h @@ -11,6 +11,7 @@ #ifndef vtk_m_exec_ConnectivityStructured_h #define vtk_m_exec_ConnectivityStructured_h +#include #include #include #include @@ -77,28 +78,54 @@ public: return Helper::GetIndices(this->Internals, index); } + VTKM_EXEC_CONT SchedulingRangeType FlatToLogicalVisitIndex(vtkm::Id flatVisitIndex) const + { + return Helper::FlatToLogicalVisitIndex(this->Internals, flatVisitIndex); + } + + VTKM_EXEC_CONT SchedulingRangeType FlatToLogicalIncidentIndex(vtkm::Id flatIncidentIndex) const + { + return Helper::FlatToLogicalIncidentIndex(this->Internals, flatIncidentIndex); + } + + VTKM_EXEC_CONT vtkm::Id LogicalToFlatVisitIndex( + const SchedulingRangeType& logicalVisitIndex) const + { + return Helper::LogicalToFlatVisitIndex(this->Internals, logicalVisitIndex); + } + + VTKM_EXEC_CONT vtkm::Id LogicalToFlatIncidentIndex( + const SchedulingRangeType& logicalIncidentIndex) const + { + return Helper::LogicalToFlatIncidentIndex(this->Internals, logicalIncidentIndex); + } + VTKM_EXEC_CONT + VTKM_DEPRECATED(2.1, "Use FlatToLogicalIncidentIndex.") SchedulingRangeType FlatToLogicalFromIndex(vtkm::Id flatFromIndex) const { - return Helper::FlatToLogicalFromIndex(this->Internals, flatFromIndex); + return this->FlatToLogicalIncidentIndex(flatFromIndex); } VTKM_EXEC_CONT + VTKM_DEPRECATED(2.1, "Use LogicalToFlatIncidentIndex.") vtkm::Id LogicalToFlatFromIndex(const SchedulingRangeType& logicalFromIndex) const { - return Helper::LogicalToFlatFromIndex(this->Internals, logicalFromIndex); + return this->LogicalToFlatIncidentIndex(logicalFromIndex); } VTKM_EXEC_CONT + VTKM_DEPRECATED(2.1, "Use FlatToLogicalVisitIndex.") SchedulingRangeType FlatToLogicalToIndex(vtkm::Id flatToIndex) const { - return Helper::FlatToLogicalToIndex(this->Internals, flatToIndex); + return this->FlatToLogicalVisitIndex(flatToIndex); } VTKM_EXEC_CONT + VTKM_DEPRECATED(2.1, "Use LogicalToFlatVisitIndex.") vtkm::Id LogicalToFlatToIndex(const SchedulingRangeType& logicalToIndex) const { - return Helper::LogicalToFlatToIndex(this->Internals, logicalToIndex); + return this->LogicalToFlatVisitIndex(logicalToIndex); } VTKM_EXEC_CONT diff --git a/vtkm/exec/arg/ThreadIndicesPointNeighborhood.h b/vtkm/exec/arg/ThreadIndicesPointNeighborhood.h index 00318e25a..4bcf7f915 100644 --- a/vtkm/exec/arg/ThreadIndicesPointNeighborhood.h +++ b/vtkm/exec/arg/ThreadIndicesPointNeighborhood.h @@ -72,7 +72,7 @@ public: inputIndex, visitIndex, outputIndex, - vtkm::exec::BoundaryState{ detail::To3D(connectivity.FlatToLogicalToIndex(inputIndex)), + vtkm::exec::BoundaryState{ detail::To3D(connectivity.FlatToLogicalVisitIndex(inputIndex)), detail::To3D(connectivity.GetPointDimensions()) }) { } diff --git a/vtkm/exec/arg/ThreadIndicesTopologyMap.h b/vtkm/exec/arg/ThreadIndicesTopologyMap.h index 95f2c9165..970afa0fa 100644 --- a/vtkm/exec/arg/ThreadIndicesTopologyMap.h +++ b/vtkm/exec/arg/ThreadIndicesTopologyMap.h @@ -181,7 +181,7 @@ public: this->InputIndex = inputIndex; this->VisitIndex = visitIndex; this->OutputIndex = outputIndex; - this->LogicalIndex = connectivity.FlatToLogicalToIndex(this->InputIndex); + this->LogicalIndex = connectivity.FlatToLogicalVisitIndex(this->InputIndex); this->IndicesIncident = connectivity.GetIndices(this->LogicalIndex); this->CellShape = connectivity.GetCellShape(this->InputIndex); } @@ -338,7 +338,7 @@ public: const ConnectivityType& connectivity) { this->ThreadIndex = threadIndex; - this->LogicalIndex = connectivity.FlatToLogicalToIndex(inputIndex); + this->LogicalIndex = connectivity.FlatToLogicalVisitIndex(inputIndex); this->IndicesIncident = connectivity.GetIndices(this->LogicalIndex); this->CellShape = connectivity.GetCellShape(inputIndex); } @@ -503,7 +503,7 @@ public: this->OutputIndex = outputIndex; const vtkm::Id permutedIndex = permutation.Portal.Get(this->InputIndex); - this->LogicalIndex = permutation.Connectivity.FlatToLogicalToIndex(permutedIndex); + this->LogicalIndex = permutation.Connectivity.FlatToLogicalVisitIndex(permutedIndex); this->IndicesIncident = permutation.Connectivity.GetIndices(this->LogicalIndex); this->CellShape = permutation.Connectivity.GetCellShape(permutedIndex); } diff --git a/vtkm/internal/ConnectivityStructuredInternals.h b/vtkm/internal/ConnectivityStructuredInternals.h index 7e2e0717a..448faf6d6 100644 --- a/vtkm/internal/ConnectivityStructuredInternals.h +++ b/vtkm/internal/ConnectivityStructuredInternals.h @@ -607,29 +607,29 @@ struct ConnectivityStructuredIndexHelper cellIndices = Connectivity.GetIndices(cellId); // Look up the offset into the face list for each cell type diff --git a/vtkm/rendering/raytracing/VolumeRendererStructured.cxx b/vtkm/rendering/raytracing/VolumeRendererStructured.cxx index 86d084d2c..9fff4ef35 100644 --- a/vtkm/rendering/raytracing/VolumeRendererStructured.cxx +++ b/vtkm/rendering/raytracing/VolumeRendererStructured.cxx @@ -61,7 +61,7 @@ public: vtkm::Id cellId{}; auto self = static_cast(this); self->Locator.FindCell(point, cellId, parametric); - cell = self->Conn.FlatToLogicalToIndex(cellId); + cell = self->Conn.FlatToLogicalVisitIndex(cellId); self->ComputeInvSpacing(cell, point, invSpacing, parametric); } @@ -74,7 +74,7 @@ public: VTKM_EXEC inline vtkm::Id GetCellIndex(const vtkm::Id3& cell) const { - return static_cast(this)->Conn.LogicalToFlatToIndex(cell); + return static_cast(this)->Conn.LogicalToFlatVisitIndex(cell); } VTKM_EXEC @@ -88,7 +88,7 @@ public: inline void GetMinPoint(const vtkm::Id3& cell, vtkm::Vec3f_32& point) const { const vtkm::Id pointIndex = - static_cast(this)->Conn.LogicalToFlatFromIndex(cell); + static_cast(this)->Conn.LogicalToFlatIncidentIndex(cell); point = static_cast(this)->Coordinates.Get(pointIndex); } };