Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Rename PPP2 to Augmented.

Browse Source
This commit is contained in:
Robert Maynard 2018-09-26 10:48:37 -07:00
parent 6f5c383e1b
commit 12b90c434b
93 changed files with 515 additions and 510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/CMakeLists.txt
View File

@ -25,7 +25,7 @@ set(CMAKE_PREFIX_PATH ${VTKm_BINARY_DIR}/${VTKm_INSTALL_CONFIG_DIR})
add_subdirectory(clipping)
add_subdirectory(contour_tree)
add_subdirectory(contour_tree_ppp2)
add_subdirectory(contour_tree_augmented)
add_subdirectory(cosmotools)
add_subdirectory(demo)
add_subdirectory(dynamic_dispatcher)

0
examples/contour_tree_ppp2/CMakeLists.txt → examples/contour_tree_augmented/CMakeLists.txt
View File

12
examples/contour_tree_ppp2/ContourTreeApp.cxx → examples/contour_tree_augmented/ContourTreeApp.cxx
View File

@ -76,10 +76,10 @@
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/cont/DataSetFieldAdd.h>
#include <vtkm/cont/Timer.h>
#include <vtkm/filter/ContourTreeUniformPPP2.h>
#include <vtkm/worklet/contourtree_ppp2/PrintVectors.h>
#include <vtkm/worklet/contourtree_ppp2/ProcessContourTree.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/filter/ContourTreeUniformAugmented.h>
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
#include <vtkm/worklet/contourtree_augmented/ProcessContourTree.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
#include <fstream>
#include <iomanip>
@ -88,7 +88,7 @@
#include <utility>
#include <vector>
namespace cppp2_ns = vtkm::worklet::contourtree_ppp2;
namespace cppp2_ns = vtkm::worklet::contourtree_augmented;
// Simple helper class for parsing the command line options
class ParseCL
@ -419,7 +419,7 @@ int main(int argc, char* argv[])
std::cout << "-------------------------------------------------------------" << std::endl;
std::cout << "----------------Contour Tree Array Sizes---------------------" << std::endl;
const vtkm::worklet::contourtree_ppp2::ContourTree& ct = filter.GetContourTree();
const vtkm::worklet::contourtree_augmented::ContourTree& ct = filter.GetContourTree();
std::cout << std::setw(42) << std::left << "#Nodes"
<< ": " << ct.nodes.GetNumberOfValues() << std::endl;
std::cout << std::setw(42) << std::left << "#Arcs"

4
vtkm/filter/CMakeLists.txt
View File

@ -25,7 +25,7 @@ set(headers
ClipWithField.h
ClipWithImplicitFunction.h
ContourTreeUniform.h
ContourTreeUniformPPP2.h
ContourTreeUniformAugmented.h
CoordinateSystemTransform.h
CrossProduct.h
DotProduct.h
@ -78,7 +78,7 @@ set(header_template_sources
ClipWithField.hxx
ClipWithImplicitFunction.hxx
ContourTreeUniform.hxx
ContourTreeUniformPPP2.hxx
ContourTreeUniformAugmented.hxx
CoordinateSystemTransform.hxx
CrossProduct.hxx
DotProduct.hxx

20
vtkm/filter/ContourTreeUniformPPP2.h → vtkm/filter/ContourTreeUniformAugmented.h
View File

@ -61,13 +61,13 @@
//==============================================================================
#ifndef vtk_m_filter_ContourTreeUniformPPP2_h
#define vtk_m_filter_ContourTreeUniformPPP2_h
#ifndef vtk_m_filter_ContourTreeUniformAugmented_h
#define vtk_m_filter_ContourTreeUniformAugmented_h
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/contourtree_ppp2/ContourTree.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/ContourTree.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
#include <utility>
#include <vector>
@ -93,8 +93,8 @@ public:
const vtkm::filter::PolicyBase<DerivedPolicy>& policy,
const DeviceAdapter& tag);
const vtkm::worklet::contourtree_ppp2::ContourTree& GetContourTree() const;
const vtkm::worklet::contourtree_ppp2::IdArrayType& GetSortOrder() const;
const vtkm::worklet::contourtree_augmented::ContourTree& GetContourTree() const;
const vtkm::worklet::contourtree_augmented::IdArrayType& GetSortOrder() const;
vtkm::Id GetNumIterations() const;
const std::vector<std::pair<std::string, vtkm::Float64>>& GetTimings() const;
@ -105,9 +105,9 @@ private:
// TODO Should the additional fields below be addd to the vtkm::filter::ResultField and what is the best way to represent them
// Additional result fields not included in the vtkm::filter::ResultField returned by DoExecute
vtkm::worklet::contourtree_ppp2::ContourTree ContourTreeData; // The contour tree
vtkm::worklet::contourtree_augmented::ContourTree ContourTreeData; // The contour tree
vtkm::Id NumIterations; // Number of iterations used to compute the contour tree
vtkm::worklet::contourtree_ppp2::IdArrayType
vtkm::worklet::contourtree_augmented::IdArrayType
MeshSortOrder; // Array with the sorted order of the mesh vertices
};
@ -154,6 +154,6 @@ struct GetRowsColsSlices
}
} // namespace vtkm::filter
#include <vtkm/filter/ContourTreeUniformPPP2.hxx>
#include <vtkm/filter/ContourTreeUniformAugmented.hxx>
#endif // vtk_m_filter_ContourTreeUniformPPP2_h
#endif // vtk_m_filter_ContourTreeUniformAugmented_h

6
vtkm/filter/ContourTreeUniformPPP2.hxx → vtkm/filter/ContourTreeUniformAugmented.hxx
View File

@ -63,7 +63,7 @@
#include <vtkm/cont/ErrorBadValue.h>
#include <vtkm/cont/Timer.h>
#include <vtkm/filter/internal/CreateResult.h>
#include <vtkm/worklet/ContourTreeUniformPPP2.h>
#include <vtkm/worklet/ContourTreeUniformAugmented.h>
namespace vtkm
{
@ -79,12 +79,12 @@ ContourTreePPP2::ContourTreePPP2(bool useMarchingCubes, bool computeRegularStruc
this->SetOutputFieldName("arcs");
}
const vtkm::worklet::contourtree_ppp2::ContourTree& ContourTreePPP2::GetContourTree() const
const vtkm::worklet::contourtree_augmented::ContourTree& ContourTreePPP2::GetContourTree() const
{
return this->ContourTreeData;
}
const vtkm::worklet::contourtree_ppp2::IdArrayType& ContourTreePPP2::GetSortOrder() const
const vtkm::worklet::contourtree_augmented::IdArrayType& ContourTreePPP2::GetSortOrder() const
{
return this->MeshSortOrder;
}

2
vtkm/filter/testing/CMakeLists.txt
View File

@ -25,7 +25,7 @@ set(unit_tests
UnitTestClipWithFieldFilter.cxx
UnitTestClipWithImplicitFunctionFilter.cxx
UnitTestContourTreeUniformFilter.cxx
UnitTestContourTreeUniformPPP2Filter.cxx
UnitTestContourTreeUniformAugmentedFilter.cxx
UnitTestCoordinateSystemTransform.cxx
UnitTestCrossProductFilter.cxx
UnitTestDotProductFilter.cxx

30
vtkm/filter/testing/UnitTestContourTreeUniformPPP2Filter.cxx → vtkm/filter/testing/UnitTestContourTreeUniformAugmentedFilter.cxx
View File

@ -60,15 +60,15 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#include <vtkm/filter/ContourTreeUniformPPP2.h>
#include <vtkm/worklet/contourtree_ppp2/ContourTree.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/filter/ContourTreeUniformAugmented.h>
#include <vtkm/worklet/contourtree_augmented/ContourTree.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/worklet/contourtree_ppp2/PrintVectors.h>
#include <vtkm/worklet/contourtree_ppp2/ProcessContourTree.h>
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
#include <vtkm/worklet/contourtree_augmented/ProcessContourTree.h>
#include <utility>
#include <vector>
@ -99,13 +99,13 @@ public:
auto result = filter.Execute(dataSet);
// Compute the saddle peaks to make sure the contour tree is correct
vtkm::worklet::contourtree_ppp2::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_ppp2::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
vtkm::worklet::contourtree_augmented::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_augmented::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
filter.GetContourTree(), filter.GetSortOrder(), saddlePeak);
// Print the contour tree we computed
std::cout << "Computed Contour Tree" << std::endl;
vtkm::worklet::contourtree_ppp2::printEdgePairArray(saddlePeak);
vtkm::worklet::contourtree_augmented::printEdgePairArray(saddlePeak);
// Print the expected contour tree
std::cout << "Expected Contour Tree" << std::endl;
std::cout << " 0 12" << std::endl;
@ -149,13 +149,13 @@ public:
auto result = filter.Execute(dataSet);
// Compute the saddle peaks to make sure the contour tree is correct
vtkm::worklet::contourtree_ppp2::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_ppp2::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
vtkm::worklet::contourtree_augmented::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_augmented::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
filter.GetContourTree(), filter.GetSortOrder(), saddlePeak);
// Print the contour tree we computed
std::cout << "Computed Contour Tree" << std::endl;
vtkm::worklet::contourtree_ppp2::printEdgePairArray(saddlePeak);
vtkm::worklet::contourtree_augmented::printEdgePairArray(saddlePeak);
// Print the expected contour tree
std::cout << "Expected Contour Tree" << std::endl;
std::cout << " 0 67" << std::endl;
@ -206,13 +206,13 @@ public:
auto result = filter.Execute(dataSet);
// Compute the saddle peaks to make sure the contour tree is correct
vtkm::worklet::contourtree_ppp2::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_ppp2::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
vtkm::worklet::contourtree_augmented::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_augmented::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
filter.GetContourTree(), filter.GetSortOrder(), saddlePeak);
// Print the contour tree we computed
std::cout << "Computed Contour Tree" << std::endl;
vtkm::worklet::contourtree_ppp2::printEdgePairArray(saddlePeak);
vtkm::worklet::contourtree_augmented::printEdgePairArray(saddlePeak);
// Print the expected contour tree
std::cout << "Expected Contour Tree" << std::endl;
std::cout << " 0 118" << std::endl;
@ -262,7 +262,7 @@ public:
};
}
int UnitTestContourTreeUniformPPP2Filter(int, char* [])
int UnitTestContourTreeUniformAugmentedFilter(int, char* [])
{
return vtkm::cont::testing::Testing::Run(
TestContourTreeUniform<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>());

4
vtkm/worklet/CMakeLists.txt
View File

@ -25,7 +25,7 @@ set(headers
CellMeasure.h
Clip.h
ContourTreeUniform.h
ContourTreeUniformPPP2.h
ContourTreeUniformAugmented.h
CoordinateSystemTransform.h
CosmoTools.h
CrossProduct.h
@ -95,7 +95,7 @@ set(header_impls
add_subdirectory(internal)
add_subdirectory(contour)
add_subdirectory(contourtree)
add_subdirectory(contourtree_ppp2)
add_subdirectory(contourtree_augmented)
add_subdirectory(cosmotools)
add_subdirectory(gradient)
add_subdirectory(splatkernels)

32
vtkm/worklet/ContourTreeUniformPPP2.h → vtkm/worklet/ContourTreeUniformAugmented.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtk_m_worklet_ContourTreeUniformPPP2_h
#define vtk_m_worklet_ContourTreeUniformPPP2_h
#ifndef vtk_m_worklet_ContourTreeUniformAugmented_h
#define vtk_m_worklet_ContourTreeUniformAugmented_h
#include <utility>
@ -79,13 +79,13 @@
#include <vtkm/worklet/WorkletMapField.h>
// Contour tree worklet includes
#include <vtkm/worklet/contourtree_ppp2/ActiveGraph.h>
#include <vtkm/worklet/contourtree_ppp2/ContourTree.h>
#include <vtkm/worklet/contourtree_ppp2/ContourTreeMaker.h>
#include <vtkm/worklet/contourtree_ppp2/MergeTree.h>
#include <vtkm/worklet/contourtree_ppp2/MeshExtrema.h>
#include <vtkm/worklet/contourtree_ppp2/Mesh_DEM_Triangulation.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/ActiveGraph.h>
#include <vtkm/worklet/contourtree_augmented/ContourTree.h>
#include <vtkm/worklet/contourtree_augmented/ContourTreeMaker.h>
#include <vtkm/worklet/contourtree_augmented/MergeTree.h>
#include <vtkm/worklet/contourtree_augmented/MeshExtrema.h>
#include <vtkm/worklet/contourtree_augmented/Mesh_DEM_Triangulation.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
@ -104,8 +104,8 @@ public:
template <typename FieldType, typename StorageType, typename DeviceAdapter>
void Run(const vtkm::cont::ArrayHandle<FieldType, StorageType> fieldArray,
std::vector<std::pair<std::string, vtkm::Float64>>& timings,
contourtree_ppp2::ContourTree& contourTree,
contourtree_ppp2::IdArrayType& sortOrder,
contourtree_augmented::ContourTree& contourTree,
contourtree_augmented::IdArrayType& sortOrder,
vtkm::Id& nIterations,
const DeviceAdapter& device,
const vtkm::Id nRows,
@ -114,7 +114,7 @@ public:
bool useMarchingCubes = false,
bool computeRegularStructure = true)
{
using namespace vtkm::worklet::contourtree_ppp2;
using namespace vtkm::worklet::contourtree_augmented;
// 2D Contour Tree
if (nSlices == 1)
{
@ -181,8 +181,8 @@ private:
template <typename FieldType, typename StorageType, typename DeviceAdapter, typename MeshClass>
void RunContourTree(const vtkm::cont::ArrayHandle<FieldType, StorageType> fieldArray,
std::vector<std::pair<std::string, vtkm::Float64>>& timings,
contourtree_ppp2::ContourTree& contourTree,
contourtree_ppp2::IdArrayType& sortOrder,
contourtree_augmented::ContourTree& contourTree,
contourtree_augmented::IdArrayType& sortOrder,
vtkm::Id& nIterations,
const DeviceAdapter& device,
const vtkm::Id /*nRows*/, // FIXME: Remove unused parameter?
@ -191,7 +191,7 @@ private:
MeshClass& mesh,
bool computeRegularStructure)
{
using namespace vtkm::worklet::contourtree_ppp2;
using namespace vtkm::worklet::contourtree_augmented;
// Start the timer
vtkm::cont::Timer<DeviceAdapter> totalTime;
@ -297,4 +297,4 @@ private:
} // namespace vtkm
} // namespace vtkm::worklet
#endif // vtk_m_worklet_ContourTreeUniformPPP2_h
#endif // vtk_m_worklet_ContourTreeUniformAugmented_h

68
vtkm/worklet/contourtree_ppp2/ActiveGraph.h → vtkm/worklet/contourtree_augmented/ActiveGraph.h
View File

@ -60,42 +60,42 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_activegraph_h
#define vtkm_worklet_contourtree_ppp2_activegraph_h
#ifndef vtkm_worklet_contourtree_augmented_activegraph_h
#define vtkm_worklet_contourtree_augmented_activegraph_h
#include <iomanip>
#include <numeric>
// local includes
#include <vtkm/worklet/contourtree_ppp2/ArrayTransforms.h>
#include <vtkm/worklet/contourtree_ppp2/MergeTree.h>
#include <vtkm/worklet/contourtree_ppp2/MeshExtrema.h>
#include <vtkm/worklet/contourtree_ppp2/PrintVectors.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/BuildChainsWorklet.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/BuildTrunkWorklet.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/CompactActiveEdgesComputeNewVertexOutdegree.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/CompactActiveEdgesTransferActiveEdges.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/EdgePeakComparator.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/FindGoverningSaddlesWorklet.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/FindSuperAndHyperNodesWorklet.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/HyperArcSuperNodeComparator.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/InitializeActiveEdges.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/InitializeActiveGraphVertices.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/InitializeEdgeFarFromActiveIndices.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/InitializeHyperarcsFromActiveIndices.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/InitializeNeighbourhoodMasksAndOutDegrees.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/SetArcsConnectNodes.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/SetArcsSetSuperAndHypernodeArcs.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/SetArcsSlideVertices.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/SetHyperArcsWorklet.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/SetSuperArcsSetTreeHyperparents.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/SetSuperArcsSetTreeSuperarcs.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/SuperArcNodeComparator.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/TransferRegularPointsWorklet.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/TransferSaddleStartsResetEdgeFar.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/TransferSaddleStartsSetNewOutdegreeForSaddles.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/TransferSaddleStartsUpdateEdgeSorter.h>
#include <vtkm/worklet/contourtree_augmented/ArrayTransforms.h>
#include <vtkm/worklet/contourtree_augmented/MergeTree.h>
#include <vtkm/worklet/contourtree_augmented/MeshExtrema.h>
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/BuildChainsWorklet.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/BuildTrunkWorklet.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/CompactActiveEdgesComputeNewVertexOutdegree.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/CompactActiveEdgesTransferActiveEdges.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/EdgePeakComparator.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/FindGoverningSaddlesWorklet.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/FindSuperAndHyperNodesWorklet.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/HyperArcSuperNodeComparator.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/InitializeActiveEdges.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/InitializeActiveGraphVertices.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/InitializeEdgeFarFromActiveIndices.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/InitializeHyperarcsFromActiveIndices.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/InitializeNeighbourhoodMasksAndOutDegrees.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/SetArcsConnectNodes.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/SetArcsSetSuperAndHypernodeArcs.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/SetArcsSlideVertices.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/SetHyperArcsWorklet.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/SetSuperArcsSetTreeHyperparents.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/SetSuperArcsSetTreeSuperarcs.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/SuperArcNodeComparator.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/TransferRegularPointsWorklet.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/TransferSaddleStartsResetEdgeFar.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/TransferSaddleStartsSetNewOutdegreeForSaddles.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/TransferSaddleStartsUpdateEdgeSorter.h>
//VTKM includes
@ -110,14 +110,14 @@
#include <vtkm/worklet/Invoker.h>
namespace active_graph_inc_ns = vtkm::worklet::contourtree_ppp2::active_graph_inc;
namespace active_graph_inc_ns = vtkm::worklet::contourtree_augmented::active_graph_inc;
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
@ -1102,7 +1102,7 @@ void ActiveGraph::DebugPrint(const char* message, const char* fileName, long lin
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

8
vtkm/worklet/contourtree_ppp2/ArrayTransforms.h → vtkm/worklet/contourtree_augmented/ArrayTransforms.h
View File

@ -61,8 +61,8 @@
//==============================================================================
// include guard
#ifndef vtkm_worklet_contourtree_ppp2_array_transforms_h
#define vtkm_worklet_contourtree_ppp2_array_transforms_h
#ifndef vtkm_worklet_contourtree_augmented_array_transforms_h
#define vtkm_worklet_contourtree_augmented_array_transforms_h
// global libraries
#include <vtkm/cont/Algorithm.h>
@ -78,7 +78,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
@ -165,7 +165,7 @@ struct onefIfHypernode
};
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

0
vtkm/worklet/contourtree_ppp2/CMakeLists.txt → vtkm/worklet/contourtree_augmented/CMakeLists.txt
View File

8
vtkm/worklet/contourtree_ppp2/ContourTree.h → vtkm/worklet/contourtree_augmented/ContourTree.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_h
#define vtkm_worklet_contourtree_ppp2_contourtree_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_h
#define vtkm_worklet_contourtree_augmented_contourtree_h
// global includes
#include <algorithm>
@ -82,7 +82,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
constexpr int N_NODE_COLORS = 12;
@ -325,7 +325,7 @@ void ContourTree::PrintDotSuperStructure()
// { // PrintDotRegularStructure()
// } // PrintDotRegularStructure()
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

62
vtkm/worklet/contourtree_ppp2/ContourTreeMaker.h → vtkm/worklet/contourtree_augmented/ContourTreeMaker.h
View File

@ -60,41 +60,41 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtreemaker_h
#define vtkm_worklet_contourtree_ppp2_contourtreemaker_h
#ifndef vtkm_worklet_contourtree_augmented_contourtreemaker_h
#define vtkm_worklet_contourtree_augmented_contourtreemaker_h
#include "Types.h"
#include <iomanip>
// local includes
#include <vtkm/worklet/contourtree_ppp2/ArrayTransforms.h>
#include <vtkm/worklet/contourtree_ppp2/ContourTree.h>
#include <vtkm/worklet/contourtree_ppp2/MergeTree.h>
#include <vtkm/worklet/contourtree_ppp2/MeshExtrema.h>
#include <vtkm/worklet/contourtree_ppp2/PrintVectors.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/ArrayTransforms.h>
#include <vtkm/worklet/contourtree_augmented/ContourTree.h>
#include <vtkm/worklet/contourtree_augmented/MergeTree.h>
#include <vtkm/worklet/contourtree_augmented/MeshExtrema.h>
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
// contourtree_maker_inc includes
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/AugmentMergeTrees_InitNewJoinSplitIDAndSuperparents.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/AugmentMergeTrees_SetAugmentedMergeArcs.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/CompressTrees_Step.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeHyperAndSuperStructure_HypernodesSetFirstSuperchild.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeHyperAndSuperStructure_PermuteArcs.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeHyperAndSuperStructure_ResetHyperparentsId.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeHyperAndSuperStructure_SetNewHypernodesAndArcs.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeRegularStructure_LocateSuperarcs.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeRegularStructure_SetArcs.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/ContourTreeNodeComparator.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/ContourTreeSuperNodeComparator.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/FindDegrees_FindRHE.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/FindDegrees_ResetUpAndDowndegree.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/FindDegrees_SubtractLHE.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/TransferLeafChains_CollapsePastRegular.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/TransferLeafChains_InitInAndOutbound.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/TransferLeafChains_TransferToContourTree.h>
#include <vtkm/worklet/contourtree_ppp2/contourtreemaker/WasNotTransferred.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/AugmentMergeTrees_InitNewJoinSplitIDAndSuperparents.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/AugmentMergeTrees_SetAugmentedMergeArcs.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/CompressTrees_Step.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeHyperAndSuperStructure_HypernodesSetFirstSuperchild.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeHyperAndSuperStructure_PermuteArcs.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeHyperAndSuperStructure_ResetHyperparentsId.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeHyperAndSuperStructure_SetNewHypernodesAndArcs.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeRegularStructure_LocateSuperarcs.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeRegularStructure_SetArcs.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/ContourTreeNodeComparator.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/ContourTreeSuperNodeComparator.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/FindDegrees_FindRHE.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/FindDegrees_ResetUpAndDowndegree.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/FindDegrees_SubtractLHE.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/TransferLeafChains_CollapsePastRegular.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/TransferLeafChains_InitInAndOutbound.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/TransferLeafChains_TransferToContourTree.h>
#include <vtkm/worklet/contourtree_augmented/contourtreemaker/WasNotTransferred.h>
#include <vtkm/worklet/contourtree_ppp2/activegraph/SuperArcNodeComparator.h>
#include <vtkm/worklet/contourtree_augmented/activegraph/SuperArcNodeComparator.h>
//VTKM includes
@ -110,14 +110,14 @@
namespace contourtree_maker_inc_ns = vtkm::worklet::contourtree_ppp2::contourtree_maker_inc;
namespace active_graph_inc_ns = vtkm::worklet::contourtree_ppp2::active_graph_inc;
namespace contourtree_maker_inc_ns = vtkm::worklet::contourtree_augmented::contourtree_maker_inc;
namespace active_graph_inc_ns = vtkm::worklet::contourtree_augmented::active_graph_inc;
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
@ -991,7 +991,7 @@ void ContourTreeMaker::DebugPrint(const char* message, const char* fileName, lon
} // ContourTreeMaker::DebugPrint()
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

8
vtkm/worklet/contourtree_ppp2/MergeTree.h → vtkm/worklet/contourtree_augmented/MergeTree.h
View File

@ -61,8 +61,8 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mergetree_h
#define vtkm_worklet_contourtree_ppp2_mergetree_h
#ifndef vtkm_worklet_contourtree_augmented_mergetree_h
#define vtkm_worklet_contourtree_augmented_mergetree_h
#include <iomanip>
@ -79,7 +79,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
class MergeTree
@ -262,7 +262,7 @@ void MergeTree::DebugPrintTree(const char* message,
#endif
} // PrintMergeTree()
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

16
vtkm/worklet/contourtree_ppp2/MeshExtrema.h → vtkm/worklet/contourtree_augmented/MeshExtrema.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_meshextrema_h
#define vtkm_worklet_contourtree_ppp2_meshextrema_h
#ifndef vtkm_worklet_contourtree_augmented_meshextrema_h
#define vtkm_worklet_contourtree_augmented_meshextrema_h
#include <iomanip>
@ -71,19 +71,19 @@
#include <vtkm/cont/Algorithm.h>
#include <vtkm/cont/ArrayHandleConstant.h>
#include <vtkm/worklet/Invoker.h>
#include <vtkm/worklet/contourtree_ppp2/PointerDoubling.h>
#include <vtkm/worklet/contourtree_ppp2/meshextrema/SetStarts.h>
#include <vtkm/worklet/contourtree_augmented/PointerDoubling.h>
#include <vtkm/worklet/contourtree_augmented/meshextrema/SetStarts.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem/SortIndices.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem/SortIndices.h>
namespace mesh_extrema_inc_ns = vtkm::worklet::contourtree_ppp2::mesh_extrema_inc;
namespace mesh_extrema_inc_ns = vtkm::worklet::contourtree_augmented::mesh_extrema_inc;
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
class MeshExtrema
@ -199,7 +199,7 @@ void MeshExtrema::DebugPrint(const char* message, const char* fileName, long lin
} // DebugPrint()
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

26
vtkm/worklet/contourtree_ppp2/Mesh_DEM_Triangulation.h → vtkm/worklet/contourtree_augmented/Mesh_DEM_Triangulation.h
View File

@ -80,28 +80,28 @@
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_h
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/ArrayHandleIndex.h>
#include <vtkm/cont/ArrayHandlePermutation.h>
#include <vtkm/worklet/Invoker.h>
#include <vtkm/worklet/contourtree_ppp2/PrintVectors.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem/SimulatedSimplicityComperator.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem/SortIndices.h>
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem/SimulatedSimplicityComperator.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem/SortIndices.h>
//Define namespace alias for the freudenthal types to make the code a bit more readable
namespace mesh_dem_inc_ns = vtkm::worklet::contourtree_ppp2::mesh_dem_inc;
namespace mesh_dem_inc_ns = vtkm::worklet::contourtree_augmented::mesh_dem_inc;
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
template <typename T, typename StorageType>
@ -252,7 +252,7 @@ void Mesh_DEM_Triangulation<T, StorageType>::SortData(
const vtkm::cont::ArrayHandle<T, StorageType>& values)
{
// Define namespace alias for mesh dem worklets
namespace mesh_dem_worklets = vtkm::worklet::contourtree_ppp2::mesh_dem_inc;
namespace mesh_dem_worklets = vtkm::worklet::contourtree_augmented::mesh_dem_inc;
// Make sure that the values have the correct size
assert(values.GetNumberOfValues() == nVertices);
@ -373,12 +373,12 @@ void Mesh_DEM_Triangulation_3D<T, StorageType>::DebugPrintValues(
#endif
} // DebugPrintValues
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm
#include "vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/Freudenthal_2D_Triangulation.h" // include Mesh_DEM_Triangulation_2D_Freudenthal
#include "vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/Freudenthal_3D_Triangulation.h" // include Mesh_DEM_Triangulation_3D_Freudenthal
#include "vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/MarchingCubes_3D_Triangulation.h" // include Mesh_DEM_Triangulation_3D_MarchinCubes
#include "vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_2D_Triangulation.h" // include Mesh_DEM_Triangulation_2D_Freudenthal
#include "vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_3D_Triangulation.h" // include Mesh_DEM_Triangulation_3D_Freudenthal
#include "vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/MarchingCubes_3D_Triangulation.h" // include Mesh_DEM_Triangulation_3D_MarchinCubes
#endif

4
vtkm/worklet/contourtree_ppp2/PointerDoubling.h → vtkm/worklet/contourtree_augmented/PointerDoubling.h
View File

@ -66,13 +66,13 @@
#include <vtkm/exec/ExecutionWholeArray.h>
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
// Functor for doing chain doubling

8
vtkm/worklet/contourtree_ppp2/PrintVectors.h → vtkm/worklet/contourtree_augmented/PrintVectors.h
View File

@ -61,8 +61,8 @@
//==============================================================================
// include guard
#ifndef vtkm_worklet_contourtree_ppp2_print_vectors_h
#define vtkm_worklet_contourtree_ppp2_print_vectors_h
#ifndef vtkm_worklet_contourtree_augmented_print_vectors_h
#define vtkm_worklet_contourtree_augmented_print_vectors_h
// global libraries
#include <iomanip>
@ -83,7 +83,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
// local constants to allow changing the spacing as needed
@ -371,7 +371,7 @@ inline void printEdgePairArray(const EdgePairArray& edgePairArray)
} // printEdgePairArray()
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

23
vtkm/worklet/contourtree_ppp2/ProcessContourTree.h → vtkm/worklet/contourtree_augmented/ProcessContourTree.h
View File

@ -61,8 +61,8 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_process_contourtree_h
#define vtkm_worklet_contourtree_ppp2_process_contourtree_h
#ifndef vtkm_worklet_contourtree_augmented_process_contourtree_h
#define vtkm_worklet_contourtree_augmented_process_contourtree_h
// global includes
#include <algorithm>
@ -78,22 +78,23 @@
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandleConstant.h>
#include <vtkm/cont/DeviceAdapterAlgorithm.h>
#include <vtkm/worklet/contourtree_ppp2/ArrayTransforms.h>
#include <vtkm/worklet/contourtree_ppp2/ContourTree.h>
#include <vtkm/worklet/contourtree_ppp2/PrintVectors.h>
#include <vtkm/worklet/contourtree_ppp2/processcontourtree/Branch.h>
#include <vtkm/worklet/contourtree_ppp2/processcontourtree/SuperArcVolumetricComparator.h>
#include <vtkm/worklet/contourtree_ppp2/processcontourtree/SuperNodeBranchComparator.h>
#include <vtkm/worklet/contourtree_augmented/ArrayTransforms.h>
#include <vtkm/worklet/contourtree_augmented/ContourTree.h>
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
#include <vtkm/worklet/contourtree_augmented/processcontourtree/Branch.h>
#include <vtkm/worklet/contourtree_augmented/processcontourtree/SuperArcVolumetricComparator.h>
#include <vtkm/worklet/contourtree_augmented/processcontourtree/SuperNodeBranchComparator.h>
namespace process_contourtree_inc_ns = vtkm::worklet::contourtree_ppp2::process_contourtree_inc;
namespace process_contourtree_inc_ns =
vtkm::worklet::contourtree_augmented::process_contourtree_inc;
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
@ -831,7 +832,7 @@ void ProcessContourTree::ComputeVolumeBranchDecomposition(
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

8
vtkm/worklet/contourtree_ppp2/Types.h → vtkm/worklet/contourtree_augmented/Types.h
View File

@ -61,8 +61,8 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_types_h
#define vtkm_worklet_contourtree_ppp2_types_h
#ifndef vtkm_worklet_contourtree_augmented_types_h
#define vtkm_worklet_contourtree_augmented_types_h
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
@ -71,7 +71,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
// constexpr for bit flags
@ -152,7 +152,7 @@ inline std::string flagString(vtkm::Id flaggedIndex)
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/BuildChainsWorklet.h → vtkm/worklet/contourtree_augmented/activegraph/BuildChainsWorklet.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_build_chains_worklet_h
#define vtkm_worklet_contourtree_ppp2_active_graph_build_chains_worklet_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_build_chains_worklet_h
#define vtkm_worklet_contourtree_augmented_active_graph_build_chains_worklet_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -140,7 +140,7 @@ public:
}; // BuildChainsWorklet
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/BuildTrunkWorklet.h → vtkm/worklet/contourtree_augmented/activegraph/BuildTrunkWorklet.h
View File

@ -61,17 +61,17 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_build_trunk_worklet_h
#define vtkm_worklet_contourtree_ppp2_active_graph_build_trunk_worklet_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_build_trunk_worklet_h
#define vtkm_worklet_contourtree_augmented_active_graph_build_trunk_worklet_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -135,7 +135,7 @@ public:
}; // BuildTrunkWorklet
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

0
vtkm/worklet/contourtree_ppp2/activegraph/CMakeLists.txt → vtkm/worklet/contourtree_augmented/activegraph/CMakeLists.txt
View File

10
vtkm/worklet/contourtree_ppp2/activegraph/CompactActiveEdgesComputeNewVertexOutdegree.h → vtkm/worklet/contourtree_augmented/activegraph/CompactActiveEdgesComputeNewVertexOutdegree.h
View File

@ -60,18 +60,18 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_compact_active_edges_new_vertex_outdegree_h
#define vtkm_worklet_contourtree_ppp2_active_graph_compact_active_edges_new_vertex_outdegree_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_compact_active_edges_new_vertex_outdegree_h
#define vtkm_worklet_contourtree_augmented_active_graph_compact_active_edges_new_vertex_outdegree_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -194,7 +194,7 @@ public:
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/CompactActiveEdgesTransferActiveEdges.h → vtkm/worklet/contourtree_augmented/activegraph/CompactActiveEdgesTransferActiveEdges.h
View File

@ -60,18 +60,18 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_compact_active_edges_transfer_active_edges_h
#define vtkm_worklet_contourtree_ppp2_active_graph_compact_active_edges_transfer_active_edges_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_compact_active_edges_transfer_active_edges_h
#define vtkm_worklet_contourtree_augmented_active_graph_compact_active_edges_transfer_active_edges_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -217,7 +217,7 @@ public:
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/EdgePeakComparator.h → vtkm/worklet/contourtree_augmented/activegraph/EdgePeakComparator.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_inc_edge_peak_comparator_h
#define vtkm_worklet_contourtree_ppp2_active_graph_inc_edge_peak_comparator_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_inc_edge_peak_comparator_h
#define vtkm_worklet_contourtree_augmented_active_graph_inc_edge_peak_comparator_h
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -146,7 +146,7 @@ public:
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/FindGoverningSaddlesWorklet.h → vtkm/worklet/contourtree_augmented/activegraph/FindGoverningSaddlesWorklet.h
View File

@ -61,18 +61,18 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_find_governing_saddles_worklet_h
#define vtkm_worklet_contourtree_ppp2_active_graph_find_governing_saddles_worklet_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_find_governing_saddles_worklet_h
#define vtkm_worklet_contourtree_augmented_active_graph_find_governing_saddles_worklet_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -189,7 +189,7 @@ public:
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/FindSuperAndHyperNodesWorklet.h → vtkm/worklet/contourtree_augmented/activegraph/FindSuperAndHyperNodesWorklet.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_find_super_and_hyper_nodes_worklet_h
#define vtkm_worklet_contourtree_ppp2_active_graph_find_super_and_hyper_nodes_worklet_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_find_super_and_hyper_nodes_worklet_h
#define vtkm_worklet_contourtree_augmented_active_graph_find_super_and_hyper_nodes_worklet_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -158,7 +158,7 @@ public:
}; // FindSuperAndHyperNodesWorklet
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/HyperArcSuperNodeComparator.h → vtkm/worklet/contourtree_augmented/activegraph/HyperArcSuperNodeComparator.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_inc_hyper_arc_super_node_comparator_h
#define vtkm_worklet_contourtree_ppp2_active_graph_inc_hyper_arc_super_node_comparator_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_inc_hyper_arc_super_node_comparator_h
#define vtkm_worklet_contourtree_augmented_active_graph_inc_hyper_arc_super_node_comparator_h
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -127,7 +127,7 @@ public:
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/InitializeActiveEdges.h → vtkm/worklet/contourtree_augmented/activegraph/InitializeActiveEdges.h
View File

@ -60,18 +60,18 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_initialize_active_edges_h
#define vtkm_worklet_contourtree_ppp2_active_graph_initialize_active_edges_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_initialize_active_edges_h
#define vtkm_worklet_contourtree_augmented_active_graph_initialize_active_edges_h
#include <vtkm/exec/arg/BasicArg.h>
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -210,7 +210,7 @@ private:
} // namespace mesh_dem_triangulation_worklets
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

8
vtkm/worklet/contourtree_ppp2/activegraph/InitializeActiveGraphVertices.h → vtkm/worklet/contourtree_augmented/activegraph/InitializeActiveGraphVertices.h
View File

@ -61,8 +61,8 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_initialize_active_graph_vertices_h
#define vtkm_worklet_contourtree_ppp2_active_graph_initialize_active_graph_vertices_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_initialize_active_graph_vertices_h
#define vtkm_worklet_contourtree_augmented_active_graph_initialize_active_graph_vertices_h
#include <vtkm/worklet/WorkletMapField.h>
@ -70,7 +70,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -148,7 +148,7 @@ public:
} // namespace mesh_dem_triangulation_worklets
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

12
vtkm/worklet/contourtree_ppp2/activegraph/InitializeEdgeFarFromActiveIndices.h → vtkm/worklet/contourtree_augmented/activegraph/InitializeEdgeFarFromActiveIndices.h
View File

@ -61,18 +61,18 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_initialize_edge_far_from_active_indices_h
#define vtkm_worklet_contourtree_ppp2_active_graph_initialize_edge_far_from_active_indices_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_initialize_edge_far_from_active_indices_h
#define vtkm_worklet_contourtree_augmented_active_graph_initialize_edge_far_from_active_indices_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -101,7 +101,7 @@ public:
// first we retrieve the ID of the far end
vtkm::Id currEdgeFar = edgeFarPortal.Get(edge);
// next we follow up to an extremum
currEdgeFar = vtkm::worklet::contourtree_ppp2::maskedIndex(extremaPortal.Get(currEdgeFar));
currEdgeFar = vtkm::worklet::contourtree_augmented::maskedIndex(extremaPortal.Get(currEdgeFar));
// now we reverse lookup to get the new ID
edgeFarPortal.Set(edge, activeIndicesPortal.Get(currEdgeFar));
@ -122,7 +122,7 @@ public:
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/InitializeHyperarcsFromActiveIndices.h → vtkm/worklet/contourtree_augmented/activegraph/InitializeHyperarcsFromActiveIndices.h
View File

@ -60,18 +60,18 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_initialize_hyperarcs_from_active_indices_h
#define vtkm_worklet_contourtree_ppp2_active_graph_initialize_hyperarcs_from_active_indices_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_initialize_hyperarcs_from_active_indices_h
#define vtkm_worklet_contourtree_augmented_active_graph_initialize_hyperarcs_from_active_indices_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -128,7 +128,7 @@ public:
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

8
vtkm/worklet/contourtree_ppp2/activegraph/InitializeNeighbourhoodMasksAndOutDegrees.h → vtkm/worklet/contourtree_augmented/activegraph/InitializeNeighbourhoodMasksAndOutDegrees.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_initialize_neighbourhood_masks_and_out_degrees_h
#define vtkm_worklet_contourtree_ppp2_active_graph_initialize_neighbourhood_masks_and_out_degrees_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_initialize_neighbourhood_masks_and_out_degrees_h
#define vtkm_worklet_contourtree_augmented_active_graph_initialize_neighbourhood_masks_and_out_degrees_h
#include <vtkm/worklet/WorkletMapField.h>
@ -69,7 +69,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -128,7 +128,7 @@ private:
} // namespace mesh_dem_triangulation_worklets
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/SetArcsConnectNodes.h → vtkm/worklet/contourtree_augmented/activegraph/SetArcsConnectNodes.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_set_arcs_connect_nodes_h
#define vtkm_worklet_contourtree_ppp2_active_graph_set_arcs_connect_nodes_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_set_arcs_connect_nodes_h
#define vtkm_worklet_contourtree_augmented_active_graph_set_arcs_connect_nodes_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -163,7 +163,7 @@ public:
}; // SetArcsConnectNodes
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/SetArcsSetSuperAndHypernodeArcs.h → vtkm/worklet/contourtree_augmented/activegraph/SetArcsSetSuperAndHypernodeArcs.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_set_arcs_set_super_and_hypernode_arcs_h
#define vtkm_worklet_contourtree_ppp2_active_graph_set_arcs_set_super_and_hypernode_arcs_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_set_arcs_set_super_and_hypernode_arcs_h
#define vtkm_worklet_contourtree_augmented_active_graph_set_arcs_set_super_and_hypernode_arcs_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -159,7 +159,7 @@ public:
}; // SetArcsSetSuperAndHypernodeArcs
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/SetArcsSlideVertices.h → vtkm/worklet/contourtree_augmented/activegraph/SetArcsSlideVertices.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_set_arcs_slide_vertices_h
#define vtkm_worklet_contourtree_ppp2_active_graph_set_arcs_slide_vertices_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_set_arcs_slide_vertices_h
#define vtkm_worklet_contourtree_augmented_active_graph_set_arcs_slide_vertices_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -278,7 +278,7 @@ public:
}; // SetArcsSlideVertices
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/SetHyperArcsWorklet.h → vtkm/worklet/contourtree_augmented/activegraph/SetHyperArcsWorklet.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_set_hyper_arcs_worklet_h
#define vtkm_worklet_contourtree_ppp2_active_graph_set_hyper_arcs_worklet_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_set_hyper_arcs_worklet_h
#define vtkm_worklet_contourtree_augmented_active_graph_set_hyper_arcs_worklet_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -136,7 +136,7 @@ public:
}; // SetHyperArcsWorklet
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/SetSuperArcsSetTreeHyperparents.h → vtkm/worklet/contourtree_augmented/activegraph/SetSuperArcsSetTreeHyperparents.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_set_super_arcs_set_tree_hyperparents_h
#define vtkm_worklet_contourtree_ppp2_active_graph_set_super_arcs_set_tree_hyperparents_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_set_super_arcs_set_tree_hyperparents_h
#define vtkm_worklet_contourtree_augmented_active_graph_set_super_arcs_set_tree_hyperparents_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -131,7 +131,7 @@ public:
}; // SetSuperArcsSetTreeHyperparents
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/SetSuperArcsSetTreeSuperarcs.h → vtkm/worklet/contourtree_augmented/activegraph/SetSuperArcsSetTreeSuperarcs.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_set_super_arcs_set_tree_superarcs_h
#define vtkm_worklet_contourtree_ppp2_active_graph_set_super_arcs_set_tree_superarcs_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_set_super_arcs_set_tree_superarcs_h
#define vtkm_worklet_contourtree_augmented_active_graph_set_super_arcs_set_tree_superarcs_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -198,7 +198,7 @@ public:
}; // SetSuperArcsSetTreeSuperarcs
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/SuperArcNodeComparator.h → vtkm/worklet/contourtree_augmented/activegraph/SuperArcNodeComparator.h
View File

@ -60,18 +60,18 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_inc_super_arc_node_comparator_h
#define vtkm_worklet_contourtree_ppp2_active_graph_inc_super_arc_node_comparator_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_inc_super_arc_node_comparator_h
#define vtkm_worklet_contourtree_augmented_active_graph_inc_super_arc_node_comparator_h
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -124,7 +124,7 @@ public:
}; // SuperArcNodeComparator
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/TransferRegularPointsWorklet.h → vtkm/worklet/contourtree_augmented/activegraph/TransferRegularPointsWorklet.h
View File

@ -61,18 +61,18 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_transfer_regular_points_worklet_h
#define vtkm_worklet_contourtree_ppp2_active_graph_transfer_regular_points_worklet_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_transfer_regular_points_worklet_h
#define vtkm_worklet_contourtree_augmented_active_graph_transfer_regular_points_worklet_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -170,7 +170,7 @@ private:
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/TransferSaddleStartsResetEdgeFar.h → vtkm/worklet/contourtree_augmented/activegraph/TransferSaddleStartsResetEdgeFar.h
View File

@ -60,18 +60,18 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_transfer_saddle_starts_reset_edge_far_h
#define vtkm_worklet_contourtree_ppp2_active_graph_transfer_saddle_starts_reset_edge_far_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_transfer_saddle_starts_reset_edge_far_h
#define vtkm_worklet_contourtree_augmented_active_graph_transfer_saddle_starts_reset_edge_far_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -111,7 +111,7 @@ public:
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/TransferSaddleStartsSetNewOutdegreeForSaddles.h → vtkm/worklet/contourtree_augmented/activegraph/TransferSaddleStartsSetNewOutdegreeForSaddles.h
View File

@ -61,18 +61,18 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_transfer_saddle_starts_set_new_outdegree_for_saddles_h
#define vtkm_worklet_contourtree_ppp2_active_graph_transfer_saddle_starts_set_new_outdegree_for_saddles_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_transfer_saddle_starts_set_new_outdegree_for_saddles_h
#define vtkm_worklet_contourtree_augmented_active_graph_transfer_saddle_starts_set_new_outdegree_for_saddles_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -195,7 +195,7 @@ public:
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/activegraph/TransferSaddleStartsUpdateEdgeSorter.h → vtkm/worklet/contourtree_augmented/activegraph/TransferSaddleStartsUpdateEdgeSorter.h
View File

@ -60,18 +60,18 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_active_graph_transfer_saddle_starts_update_edge_sorter_h
#define vtkm_worklet_contourtree_ppp2_active_graph_transfer_saddle_starts_update_edge_sorter_h
#ifndef vtkm_worklet_contourtree_augmented_active_graph_transfer_saddle_starts_update_edge_sorter_h
#define vtkm_worklet_contourtree_augmented_active_graph_transfer_saddle_starts_update_edge_sorter_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace active_graph_inc
{
@ -137,7 +137,7 @@ public:
} // namespace active_graph_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/AugmentMergeTrees_InitNewJoinSplitIDAndSuperparents.h → vtkm/worklet/contourtree_augmented/contourtreemaker/AugmentMergeTrees_InitNewJoinSplitIDAndSuperparents.h
View File

@ -61,17 +61,17 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_augment_merge_tree_init_new_join_splot_id_and_superparents_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_augment_merge_tree_init_new_join_splot_id_and_superparents_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_augment_merge_tree_init_new_join_splot_id_and_superparents_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_augment_merge_tree_init_new_join_splot_id_and_superparents_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -160,7 +160,7 @@ public:
}; // AugmentMergeTrees_InitNewJoinSplitIDAndSuperparents.h
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/AugmentMergeTrees_SetAugmentedMergeArcs.h → vtkm/worklet/contourtree_augmented/contourtreemaker/AugmentMergeTrees_SetAugmentedMergeArcs.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_augment_merge_tree_set_augmented_merge_arcs_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_augment_merge_tree_set_augmented_merge_arcs_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_augment_merge_tree_set_augmented_merge_arcs_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_augment_merge_tree_set_augmented_merge_arcs_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -181,7 +181,7 @@ public:
}; // AugmentMergeTrees_InitNewJoinSplitIDAndSuperparents.h
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

0
vtkm/worklet/contourtree_ppp2/contourtreemaker/CMakeLists.txt → vtkm/worklet/contourtree_augmented/contourtreemaker/CMakeLists.txt
View File

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/CompressTrees_Step.h → vtkm/worklet/contourtree_augmented/contourtreemaker/CompressTrees_Step.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_compress_trees_step_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_compress_trees_step_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_compress_trees_step_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_compress_trees_step_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -168,7 +168,7 @@ public:
}; // CompressTrees_Step
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeHyperAndSuperStructure_HypernodesSetFirstSuperchild.h → vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeHyperAndSuperStructure_HypernodesSetFirstSuperchild.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_hypernodes_set_first_superchild_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_hypernodes_set_first_superchild_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_hypernodes_set_first_superchild_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_hypernodes_set_first_superchild_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -134,7 +134,7 @@ public:
}; // AugmentMergeTrees_InitNewJoinSplitIDAndSuperparents.h
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeHyperAndSuperStructure_PermuteArcs.h → vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeHyperAndSuperStructure_PermuteArcs.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_compute_hyper_and_super_structure_permute_arcs_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_compute_hyper_and_super_structure_permute_arcs_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_compute_hyper_and_super_structure_permute_arcs_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_compute_hyper_and_super_structure_permute_arcs_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -118,7 +118,7 @@ public:
}; // AugmentMergeTrees_InitNewJoinSplitIDAndSuperparents.h
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeHyperAndSuperStructure_ResetHyperparentsId.h → vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeHyperAndSuperStructure_ResetHyperparentsId.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_reset_hyperparents_id_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_reset_hyperparents_id_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_reset_hyperparents_id_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_reset_hyperparents_id_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -109,7 +109,7 @@ public:
}; // AugmentMergeTrees_InitNewJoinSplitIDAndSuperparents.h
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeHyperAndSuperStructure_SetNewHypernodesAndArcs.h → vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeHyperAndSuperStructure_SetNewHypernodesAndArcs.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_set_new_hyper_nodes_and_arcs_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_set_new_hyper_nodes_and_arcs_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_set_new_hyper_nodes_and_arcs_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_set_new_hyper_nodes_and_arcs_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -136,7 +136,7 @@ public:
}; // AugmentMergeTrees_InitNewJoinSplitIDAndSuperparents.h
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeRegularStructure_LocateSuperarcs.h → vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeRegularStructure_LocateSuperarcs.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_compute_regular_structure_locate_superarcs_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_compute_regular_structure_locate_superarcs_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_compute_regular_structure_locate_superarcs_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_compute_regular_structure_locate_superarcs_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -409,7 +409,7 @@ public:
}; // ComputeRegularStructure_LocateSuperarcs.h
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/ComputeRegularStructure_SetArcs.h → vtkm/worklet/contourtree_augmented/contourtreemaker/ComputeRegularStructure_SetArcs.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_compute_regular_structure_set_arcs_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_compute_regular_structure_set_arcs_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_compute_regular_structure_set_arcs_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_compute_regular_structure_set_arcs_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -187,7 +187,7 @@ public:
}; // ComputeRegularStructure_SetArcs
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/ContourTreeNodeComparator.h → vtkm/worklet/contourtree_augmented/contourtreemaker/ContourTreeNodeComparator.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_contour_tree_node_comparator_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_contour_tree_node_comparator_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_contour_tree_node_comparator_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_contour_tree_node_comparator_h
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -122,7 +122,7 @@ public:
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/ContourTreeSuperNodeComparator.h → vtkm/worklet/contourtree_augmented/contourtreemaker/ContourTreeSuperNodeComparator.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_contour_tree_supernode_comparator_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_contour_tree_supernode_comparator_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_contour_tree_supernode_comparator_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_contour_tree_supernode_comparator_h
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -135,7 +135,7 @@ public:
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/FindDegrees_FindRHE.h → vtkm/worklet/contourtree_augmented/contourtreemaker/FindDegrees_FindRHE.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_find_degrees_find_rhe_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_find_degrees_find_rhe_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_find_degrees_find_rhe_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_find_degrees_find_rhe_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -131,7 +131,7 @@ public:
}; // FindDegrees_FindRHE
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/FindDegrees_ResetUpAndDowndegree.h → vtkm/worklet/contourtree_augmented/contourtreemaker/FindDegrees_ResetUpAndDowndegree.h
View File

@ -61,17 +61,17 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_find_degrees_reset_up_and_downdegree_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_find_degrees_reset_up_and_downdegree_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_find_degrees_reset_up_and_downdegree_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_find_degrees_reset_up_and_downdegree_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -113,7 +113,7 @@ public:
}; // FindDegrees_ResetUpAndDowndegree
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/FindDegrees_SubtractLHE.h → vtkm/worklet/contourtree_augmented/contourtreemaker/FindDegrees_SubtractLHE.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_find_degrees_subtract_lhe_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_find_degrees_subtract_lhe_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_find_degrees_subtract_lhe_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_find_degrees_subtract_lhe_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -129,7 +129,7 @@ public:
}; // FindDegrees_SubtractLHE
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/TransferLeafChains_CollapsePastRegular.h → vtkm/worklet/contourtree_augmented/contourtreemaker/TransferLeafChains_CollapsePastRegular.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_transfer_leaf_chains_collapse_past_regular_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_transfer_leaf_chains_collapse_past_regular_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_transfer_leaf_chains_collapse_past_regular_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_transfer_leaf_chains_collapse_past_regular_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -133,7 +133,7 @@ public:
}; // TransferLeafChains_CollapsePastRegular
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/TransferLeafChains_InitInAndOutbound.h → vtkm/worklet/contourtree_augmented/contourtreemaker/TransferLeafChains_InitInAndOutbound.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_transfer_leaf_chains_init_in_and_outbound_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_transfer_leaf_chains_init_in_and_outbound_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_transfer_leaf_chains_init_in_and_outbound_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_transfer_leaf_chains_init_in_and_outbound_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -177,7 +177,7 @@ public:
}; // TransferLeafChains_InitInAndOutound
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/TransferLeafChains_TransferToContourTree.h → vtkm/worklet/contourtree_augmented/contourtreemaker/TransferLeafChains_TransferToContourTree.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_transfer_leaf_chains_transfer_to_contour_tree_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_transfer_leaf_chains_transfer_to_contour_tree_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_transfer_leaf_chains_transfer_to_contour_tree_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_transfer_leaf_chains_transfer_to_contour_tree_h
#include <vtkm/worklet/WorkletMapField.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -206,7 +206,7 @@ public:
}; // TransferLeafChains_TransferToContourTree
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/contourtreemaker/WasNotTransferred.h → vtkm/worklet/contourtree_augmented/contourtreemaker/WasNotTransferred.h
View File

@ -60,17 +60,17 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_was_not_transferred_h
#define vtkm_worklet_contourtree_ppp2_contourtree_maker_inc_was_not_transferred_h
#ifndef vtkm_worklet_contourtree_augmented_contourtree_maker_inc_was_not_transferred_h
#define vtkm_worklet_contourtree_augmented_contourtree_maker_inc_was_not_transferred_h
#include <vtkm/Types.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace contourtree_maker_inc
{
@ -93,7 +93,7 @@ public:
}; // class WasNotTransferred
} // namespace contourtree_maker_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

0
vtkm/worklet/contourtree_ppp2/mesh_dem/CMakeLists.txt → vtkm/worklet/contourtree_augmented/mesh_dem/CMakeLists.txt
View File

8
vtkm/worklet/contourtree_ppp2/mesh_dem/ExecutionObject_MeshStructure_2D.h → vtkm/worklet/contourtree_augmented/mesh_dem/ExecutionObject_MeshStructure_2D.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_inc_execution_object_mesh_2d_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_inc_execution_object_mesh_2d_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_inc_execution_object_mesh_2d_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_inc_execution_object_mesh_2d_h
#include <vtkm/Types.h>
@ -70,7 +70,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace mesh_dem_inc
{
@ -111,7 +111,7 @@ public:
}; // ExecutionObject_MeshStructure_2D
} // namespace mesh_dem_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

8
vtkm/worklet/contourtree_ppp2/mesh_dem/ExecutionObject_MeshStructure_3D.h → vtkm/worklet/contourtree_augmented/mesh_dem/ExecutionObject_MeshStructure_3D.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_inc_execution_object_mesh_3d_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_inc_execution_object_mesh_3d_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_inc_execution_object_mesh_3d_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_inc_execution_object_mesh_3d_h
#include <vtkm/Types.h>
@ -70,7 +70,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace mesh_dem_inc
{
@ -120,7 +120,7 @@ public:
}; // Mesh_DEM_2D_ExecutionObject
} // namespace mesh_dem_triangulation_worklets
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

8
vtkm/worklet/contourtree_ppp2/mesh_dem/SimulatedSimplicityComperator.h → vtkm/worklet/contourtree_augmented/mesh_dem/SimulatedSimplicityComperator.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_inc_simlated_simplicity_comperator_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_inc_simlated_simplicity_comperator_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_inc_simlated_simplicity_comperator_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_inc_simlated_simplicity_comperator_h
#include <vtkm/cont/ArrayHandle.h>
@ -69,7 +69,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace mesh_dem_inc
{
@ -113,7 +113,7 @@ public:
} // namespace mesh_dem_triangulation_worklets
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

8
vtkm/worklet/contourtree_ppp2/mesh_dem/SortIndices.h → vtkm/worklet/contourtree_augmented/mesh_dem/SortIndices.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_inc_sort_indices_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_inc_sort_indices_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_inc_sort_indices_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_inc_sort_indices_h
#include <vtkm/worklet/WorkletMapField.h>
@ -69,7 +69,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace mesh_dem_inc
{
@ -98,7 +98,7 @@ public:
}; // Mesh2D_DEM_VertexStarter
} // namespace mesh_dem_triangulation_worklets
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

0
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/CMakeLists.txt → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/CMakeLists.txt
View File

17
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/Freudenthal_2D_Triangulation.h → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_2D_Triangulation.h
View File

@ -60,26 +60,27 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_2d_freudenthal_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_2d_freudenthal_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_2d_freudenthal_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_2d_freudenthal_h
#include <cstdlib>
#include <vtkm/Types.h>
#include <vtkm/worklet/contourtree_ppp2/Mesh_DEM_Triangulation.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_2D/ExecutionObject_MeshStructure.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_2D/Types.h>
#include <vtkm/worklet/contourtree_augmented/Mesh_DEM_Triangulation.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/ExecutionObject_MeshStructure.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/Types.h>
#include <vtkm/cont/ExecutionObjectBase.h>
//Define namespace alias for the freudenthal and mergetree inc to make the code a bit more readable
namespace m2d_freudenthal_inc_ns = vtkm::worklet::contourtree_ppp2::mesh_dem_2d_freudenthal_inc;
namespace m2d_freudenthal_inc_ns =
vtkm::worklet::contourtree_augmented::mesh_dem_2d_freudenthal_inc;
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
template <typename T, typename StorageType>
@ -138,7 +139,7 @@ mesh_dem_2d_freudenthal_inc::ExecutionObject_MeshStructure<DeviceTag>
}
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

17
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/Freudenthal_3D_Triangulation.h → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/Freudenthal_3D_Triangulation.h
View File

@ -61,8 +61,8 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3d_freudenthal_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3d_freudenthal_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3d_freudenthal_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3d_freudenthal_h
#include <cstdlib>
#include <vtkm/Types.h>
@ -70,18 +70,19 @@
#include <vtkm/cont/ArrayHandleGroupVec.h>
#include <vtkm/cont/ExecutionObjectBase.h>
#include <vtkm/worklet/contourtree_ppp2/Mesh_DEM_Triangulation.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_3D/ExecutionObject_MeshStructure.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_3D/Types.h>
#include <vtkm/worklet/contourtree_augmented/Mesh_DEM_Triangulation.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/ExecutionObject_MeshStructure.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/Types.h>
//Define namespace alias for the freudenthal types to make the code a bit more readable
namespace m3d_freudenthal_inc_ns = vtkm::worklet::contourtree_ppp2::mesh_dem_3d_freudenthal_inc;
namespace m3d_freudenthal_inc_ns =
vtkm::worklet::contourtree_augmented::mesh_dem_3d_freudenthal_inc;
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
template <typename T, typename StorageType>
@ -152,7 +153,7 @@ mesh_dem_3d_freudenthal_inc::ExecutionObject_MeshStructure<DeviceTag>
}
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

17
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/MarchingCubes_3D_Triangulation.h → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/MarchingCubes_3D_Triangulation.h
View File

@ -61,8 +61,8 @@
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3d_marchingcubes_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3d_marchingcubes_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3d_marchingcubes_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3d_marchingcubes_h
#include <cstdlib>
#include <vtkm/Types.h>
@ -70,18 +70,19 @@
#include <vtkm/cont/ArrayHandleGroupVec.h>
#include <vtkm/cont/ExecutionObjectBase.h>
#include <vtkm/worklet/contourtree_ppp2/Mesh_DEM_Triangulation.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/marchingcubes_3D/ExecutionObject_MeshStructure.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/marchingcubes_3D/Types.h>
#include <vtkm/worklet/contourtree_augmented/Mesh_DEM_Triangulation.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/ExecutionObject_MeshStructure.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/Types.h>
//Define namespace alias for the marching cubes types to make the code a bit more readable
namespace m3d_marchingcubes_inc_ns = vtkm::worklet::contourtree_ppp2::mesh_dem_3d_marchingcubes_inc;
namespace m3d_marchingcubes_inc_ns =
vtkm::worklet::contourtree_augmented::mesh_dem_3d_marchingcubes_inc;
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
template <typename T, typename StorageType>
@ -183,7 +184,7 @@ mesh_dem_3d_marchingcubes_inc::ExecutionObject_MeshStructure<DeviceTag>
inCubeConnectionsEighteen);
}
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // worklet
} // vtkm

0
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_2D/CMakeLists.txt → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/CMakeLists.txt
View File

18
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_2D/ExecutionObject_MeshStructure.h → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/ExecutionObject_MeshStructure.h
View File

@ -60,27 +60,27 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_2D_freudenthal_execution_obect_mesh_structure_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_2D_freudenthal_execution_obect_mesh_structure_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_2D_freudenthal_execution_obect_mesh_structure_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_2D_freudenthal_execution_obect_mesh_structure_h
#include <vtkm/Pair.h>
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem/ExecutionObject_MeshStructure_2D.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_2D/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem/ExecutionObject_MeshStructure_2D.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/Types.h>
//Define namespace alias for the freudenthal types to make the code a bit more readable
namespace mesh_dem_inc_ns = vtkm::worklet::contourtree_ppp2::mesh_dem_inc;
namespace cpp2_ns = vtkm::worklet::contourtree_ppp2;
namespace mesh_dem_inc_ns = vtkm::worklet::contourtree_augmented::mesh_dem_inc;
namespace cpp2_ns = vtkm::worklet::contourtree_augmented;
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace mesh_dem_2d_freudenthal_inc
{
@ -304,7 +304,7 @@ private:
}; // ExecutionObjec_MeshStructure_3Dt
} // namespace mesh_dem_2d_freudenthal_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

8
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_2D/Types.h → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/Types.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_2D_freudenthal_types_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_2D_freudenthal_types_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_2D_freudenthal_types_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_2D_freudenthal_types_h
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
@ -71,7 +71,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace mesh_dem_2d_freudenthal_inc
{
@ -89,7 +89,7 @@ static const vtkm::Int8 edgeBoundaryDetectionMasks[N_INCIDENT_EDGES] = {
};
} // mesh_dem_types_2d_freudenthal
} // contourtree_ppp2
} // contourtree_augmented
} // worklet
} // vtkm

0
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_3D/CMakeLists.txt → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/CMakeLists.txt
View File

18
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_3D/ExecutionObject_MeshStructure.h → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/ExecutionObject_MeshStructure.h
View File

@ -60,28 +60,28 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3D_freudenthal_execution_obect_mesh_structure_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3D_freudenthal_execution_obect_mesh_structure_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3D_freudenthal_execution_obect_mesh_structure_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3D_freudenthal_execution_obect_mesh_structure_h
#include <vtkm/Pair.h>
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/ArrayHandleGroupVec.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem/ExecutionObject_MeshStructure_3D.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_3D/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem/ExecutionObject_MeshStructure_3D.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/Types.h>
//Define namespace alias for the freudenthal types to make the code a bit more readable
namespace mesh_dem_inc_ns = vtkm::worklet::contourtree_ppp2::mesh_dem_inc;
namespace cpp2_ns = vtkm::worklet::contourtree_ppp2;
namespace mesh_dem_inc_ns = vtkm::worklet::contourtree_augmented::mesh_dem_inc;
namespace cpp2_ns = vtkm::worklet::contourtree_augmented;
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace mesh_dem_3d_freudenthal_inc
{
@ -259,7 +259,7 @@ private:
}; // ExecutionObjec_MeshStructure_3Dt
} // namespace mesh_dem_3d_freudenthal_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

6
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/freudenthal_3D/Types.h → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/Types.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3D_freudenthal_types_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3D_freudenthal_types_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3D_freudenthal_types_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3D_freudenthal_types_h
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
@ -71,7 +71,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace mesh_dem_3d_freudenthal_inc
{

0
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/marchingcubes_3D/CMakeLists.txt → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/CMakeLists.txt
View File

21
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/marchingcubes_3D/ExecutionObject_MeshStructure.h → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/ExecutionObject_MeshStructure.h
View File

@ -60,28 +60,29 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3D_marchingcubes_execution_obect_mesh_structure_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3D_marchingcubes_execution_obect_mesh_structure_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3D_marchingcubes_execution_obect_mesh_structure_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3D_marchingcubes_execution_obect_mesh_structure_h
#include <vtkm/Pair.h>
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/cont/ArrayHandleGroupVec.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem/ExecutionObject_MeshStructure_3D.h>
#include <vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/marchingcubes_3D/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem/ExecutionObject_MeshStructure_3D.h>
#include <vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/Types.h>
//Define namespace alias for the marching cubes types to make the code a bit more readable
namespace m3d_marchingcubes_inc_ns = vtkm::worklet::contourtree_ppp2::mesh_dem_3d_marchingcubes_inc;
namespace mesh_dem_inc_ns = vtkm::worklet::contourtree_ppp2::mesh_dem_inc;
namespace cpp2_ns = vtkm::worklet::contourtree_ppp2;
namespace m3d_marchingcubes_inc_ns =
vtkm::worklet::contourtree_augmented::mesh_dem_3d_marchingcubes_inc;
namespace mesh_dem_inc_ns = vtkm::worklet::contourtree_augmented::mesh_dem_inc;
namespace cpp2_ns = vtkm::worklet::contourtree_augmented;
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace mesh_dem_3d_marchingcubes_inc
{
@ -391,7 +392,7 @@ private:
}; // ExecutionObjec_MeshStructure_3Dt
} // namespace mesh_dem_3d_marchingcubes_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

8
vtkm/worklet/contourtree_ppp2/mesh_dem_meshtypes/marchingcubes_3D/Types.h → vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/Types.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3D_marchingcubes_types_h
#define vtkm_worklet_contourtree_ppp2_mesh_dem_triangulation_3D_marchingcubes_types_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3D_marchingcubes_types_h
#define vtkm_worklet_contourtree_augmented_mesh_dem_triangulation_3D_marchingcubes_types_h
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
@ -71,7 +71,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace mesh_dem_3d_marchingcubes_inc
{
@ -193,7 +193,7 @@ static const vtkm::UInt32 inCubeConnectionsEighteen[inCubeConnectionsEighteen_Nu
} // mesh_dem_types_2d_freudenthal
} // contourtree_ppp2
} // contourtree_augmented
} // worklet
} // vtkm

0
vtkm/worklet/contourtree_ppp2/meshextrema/CMakeLists.txt → vtkm/worklet/contourtree_augmented/meshextrema/CMakeLists.txt
View File

8
vtkm/worklet/contourtree_ppp2/meshextrema/SetStarts.h → vtkm/worklet/contourtree_augmented/meshextrema/SetStarts.h
View File

@ -60,8 +60,8 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_mesh_extrema_inc_set_starts_h
#define vtkm_worklet_contourtree_ppp2_mesh_extrema_inc_set_starts_h
#ifndef vtkm_worklet_contourtree_augmented_mesh_extrema_inc_set_starts_h
#define vtkm_worklet_contourtree_augmented_mesh_extrema_inc_set_starts_h
#include <vtkm/worklet/WorkletMapField.h>
@ -69,7 +69,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace mesh_extrema_inc
{
@ -108,7 +108,7 @@ public:
} // namespace mesh_dem_triangulation_worklets
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

12
vtkm/worklet/contourtree_ppp2/processcontourtree/Branch.h → vtkm/worklet/contourtree_augmented/processcontourtree/Branch.h
View File

@ -60,12 +60,12 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_process_contourtree_inc_branch_h
#define vtkm_worklet_contourtree_ppp2_process_contourtree_inc_branch_h
#ifndef vtkm_worklet_contourtree_augmented_process_contourtree_inc_branch_h
#define vtkm_worklet_contourtree_augmented_process_contourtree_inc_branch_h
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/contourtree_ppp2/ContourTree.h>
#include <vtkm/worklet/contourtree_ppp2/processcontourtree/PiecewiseLinearFunction.h>
#include <vtkm/worklet/contourtree_augmented/ContourTree.h>
#include <vtkm/worklet/contourtree_augmented/processcontourtree/PiecewiseLinearFunction.h>
#include <cmath>
@ -73,7 +73,7 @@ namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace process_contourtree_inc
{
@ -500,7 +500,7 @@ Branch<T>* Branch<T>::load(std::istream& is)
*/
} // process_contourtree_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

0
vtkm/worklet/contourtree_ppp2/processcontourtree/CMakeLists.txt → vtkm/worklet/contourtree_augmented/processcontourtree/CMakeLists.txt
View File

10
vtkm/worklet/contourtree_ppp2/processcontourtree/PiecewiseLinearFunction.h → vtkm/worklet/contourtree_augmented/processcontourtree/PiecewiseLinearFunction.h
View File

@ -60,18 +60,18 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_process_contourtree_inc_piecewise_linear_function_h
#define vtkm_worklet_contourtree_ppp2_process_contourtree_inc_piecewise_linear_function_h
#ifndef vtkm_worklet_contourtree_augmented_process_contourtree_inc_piecewise_linear_function_h
#define vtkm_worklet_contourtree_augmented_process_contourtree_inc_piecewise_linear_function_h
#include <vtkm/Pair.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/contourtree_ppp2/ContourTree.h>
#include <vtkm/worklet/contourtree_augmented/ContourTree.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace process_contourtree_inc
{
@ -188,7 +188,7 @@ public:
} // process_contourtree_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/processcontourtree/SuperArcVolumetricComparator.h → vtkm/worklet/contourtree_augmented/processcontourtree/SuperArcVolumetricComparator.h
View File

@ -60,19 +60,19 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_process_contourtree_inc_superarc_volumetric_comperator_h
#define vtkm_worklet_contourtree_ppp2_process_contourtree_inc_superarc_volumetric_comperator_h
#ifndef vtkm_worklet_contourtree_augmented_process_contourtree_inc_superarc_volumetric_comperator_h
#define vtkm_worklet_contourtree_augmented_process_contourtree_inc_superarc_volumetric_comperator_h
#include <vtkm/Pair.h>
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace process_contourtree_inc
{
@ -162,7 +162,7 @@ public:
} // namespace process_contourtree_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

10
vtkm/worklet/contourtree_ppp2/processcontourtree/SuperNodeBranchComparator.h → vtkm/worklet/contourtree_augmented/processcontourtree/SuperNodeBranchComparator.h
View File

@ -60,19 +60,19 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#ifndef vtkm_worklet_contourtree_ppp2_process_contourtree_inc_supernode_branch_comperator_h
#define vtkm_worklet_contourtree_ppp2_process_contourtree_inc_supernode_branch_comperator_h
#ifndef vtkm_worklet_contourtree_augmented_process_contourtree_inc_supernode_branch_comperator_h
#define vtkm_worklet_contourtree_augmented_process_contourtree_inc_supernode_branch_comperator_h
#include <vtkm/Pair.h>
#include <vtkm/Types.h>
#include <vtkm/cont/ArrayHandle.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
namespace vtkm
{
namespace worklet
{
namespace contourtree_ppp2
namespace contourtree_augmented
{
namespace process_contourtree_inc
{
@ -125,7 +125,7 @@ public:
} // namespace process_contourtree_inc
} // namespace contourtree_ppp2
} // namespace contourtree_augmented
} // namespace worklet
} // namespace vtkm

2
vtkm/worklet/testing/CMakeLists.txt
View File

@ -29,7 +29,7 @@ set(unit_tests
UnitTestCellMeasure.cxx
UnitTestClipping.cxx
UnitTestContourTreeUniform.cxx
UnitTestContourTreeUniformPPP2.cxx
UnitTestContourTreeUniformAugmented.cxx
UnitTestCoordinateSystemTransform.cxx
UnitTestCosmoTools.cxx
UnitTestCrossProduct.cxx

42
vtkm/worklet/testing/UnitTestContourTreeUniformPPP2.cxx → vtkm/worklet/testing/UnitTestContourTreeUniformAugmented.cxx
View File

@ -60,15 +60,15 @@
// Oliver Ruebel (LBNL)
//==============================================================================
#include <vtkm/worklet/ContourTreeUniformPPP2.h>
#include <vtkm/worklet/contourtree_ppp2/ContourTree.h>
#include <vtkm/worklet/contourtree_ppp2/Types.h>
#include <vtkm/worklet/ContourTreeUniformAugmented.h>
#include <vtkm/worklet/contourtree_augmented/ContourTree.h>
#include <vtkm/worklet/contourtree_augmented/Types.h>
#include <vtkm/cont/testing/MakeTestDataSet.h>
#include <vtkm/cont/testing/Testing.h>
#include <vtkm/worklet/contourtree_ppp2/PrintVectors.h>
#include <vtkm/worklet/contourtree_ppp2/ProcessContourTree.h>
#include <vtkm/worklet/contourtree_augmented/PrintVectors.h>
#include <vtkm/worklet/contourtree_augmented/ProcessContourTree.h>
#include <utility>
#include <vector>
@ -107,8 +107,8 @@ public:
// Create the worklet and run it
vtkm::worklet::ContourTreePPP2 contourTreeWorklet;
std::vector<std::pair<std::string, vtkm::Float64>> timings;
vtkm::worklet::contourtree_ppp2::ContourTree contourTree;
vtkm::worklet::contourtree_ppp2::IdArrayType meshSortOrder;
vtkm::worklet::contourtree_augmented::ContourTree contourTree;
vtkm::worklet::contourtree_augmented::IdArrayType meshSortOrder;
vtkm::Id numIterations;
const bool useMarchingCubes = false;
const bool computeRegularStructure = true;
@ -126,12 +126,12 @@ public:
computeRegularStructure);
// Compute the saddle peaks to make sure the contour tree is correct
vtkm::worklet::contourtree_ppp2::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_ppp2::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
vtkm::worklet::contourtree_augmented::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_augmented::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
contourTree, meshSortOrder, saddlePeak);
// Print the contour tree we computed
std::cout << "Computed Contour Tree" << std::endl;
vtkm::worklet::contourtree_ppp2::printEdgePairArray(saddlePeak);
vtkm::worklet::contourtree_augmented::printEdgePairArray(saddlePeak);
// Print the expected contour tree
std::cout << "Expected Contour Tree" << std::endl;
std::cout << " 0 12" << std::endl;
@ -181,8 +181,8 @@ public:
// Create the worklet and run it
vtkm::worklet::ContourTreePPP2 contourTreeWorklet;
std::vector<std::pair<std::string, vtkm::Float64>> timings;
vtkm::worklet::contourtree_ppp2::ContourTree contourTree;
vtkm::worklet::contourtree_ppp2::IdArrayType meshSortOrder;
vtkm::worklet::contourtree_augmented::ContourTree contourTree;
vtkm::worklet::contourtree_augmented::IdArrayType meshSortOrder;
vtkm::Id numIterations;
const bool useMarchingCubes = false;
const bool computeRegularStructure = true;
@ -200,12 +200,12 @@ public:
computeRegularStructure);
// Compute the saddle peaks to make sure the contour tree is correct
vtkm::worklet::contourtree_ppp2::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_ppp2::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
vtkm::worklet::contourtree_augmented::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_augmented::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
contourTree, meshSortOrder, saddlePeak);
// Print the contour tree we computed
std::cout << "Computed Contour Tree" << std::endl;
vtkm::worklet::contourtree_ppp2::printEdgePairArray(saddlePeak);
vtkm::worklet::contourtree_augmented::printEdgePairArray(saddlePeak);
// Print the expected contour tree
std::cout << "Expected Contour Tree" << std::endl;
std::cout << " 0 67" << std::endl;
@ -262,8 +262,8 @@ public:
// Create the worklet and run it
vtkm::worklet::ContourTreePPP2 contourTreeWorklet;
std::vector<std::pair<std::string, vtkm::Float64>> timings;
vtkm::worklet::contourtree_ppp2::ContourTree contourTree;
vtkm::worklet::contourtree_ppp2::IdArrayType meshSortOrder;
vtkm::worklet::contourtree_augmented::ContourTree contourTree;
vtkm::worklet::contourtree_augmented::IdArrayType meshSortOrder;
vtkm::Id numIterations;
const bool useMarchingCubes = true;
const bool computeRegularStructure = true;
@ -281,12 +281,12 @@ public:
computeRegularStructure);
// Compute the saddle peaks to make sure the contour tree is correct
vtkm::worklet::contourtree_ppp2::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_ppp2::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
vtkm::worklet::contourtree_augmented::EdgePairArray saddlePeak;
vtkm::worklet::contourtree_augmented::ProcessContourTree::CollectSortedSuperarcs<DeviceAdapter>(
contourTree, meshSortOrder, saddlePeak);
// Print the contour tree we computed
std::cout << "Computed Contour Tree" << std::endl;
vtkm::worklet::contourtree_ppp2::printEdgePairArray(saddlePeak);
vtkm::worklet::contourtree_augmented::printEdgePairArray(saddlePeak);
// Print the expected contour tree
std::cout << "Expected Contour Tree" << std::endl;
std::cout << " 0 118" << std::endl;
@ -336,7 +336,7 @@ public:
};
}
int UnitTestContourTreeUniformPPP2(int, char* [])
int UnitTestContourTreeUniformAugmented(int, char* [])
{
return vtkm::cont::testing::Testing::Run(
TestContourTreeUniform<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>());