Commit Graph

9460 Commits

Author SHA1 Message Date
Gunther H. Weber
d77d4dd7d8 Clean-up (mostly debug output) 2021-10-20 14:46:23 -07:00
Oliver Ruebel
c48f707bdd Fix bug in TreeGrafter::CopyIterationDetails
Fix bug in TreeGrafter::CopyIterationDetails to set last FirstSupernodePerIteration
2021-10-20 14:46:23 -07:00
Oliver Ruebel
d23560edd2 Execute HyperSweeper only if tree is augmented 2021-10-20 14:46:23 -07:00
Oliver Ruebel
b2d43aadc6 use augmented hierarchical tree for output if available 2021-10-20 14:46:23 -07:00
Oliver Ruebel
a20ffd3d7c Use augmented HierarchicalContourTree in the HyperSweeper 2021-10-20 14:46:23 -07:00
Gunther H. Weber
542d0a5a46 Added hyper-sweeeper calls to contour tree uniform distributed filter 2021-10-20 14:46:23 -07:00
Gunther H. Weber
17f5ead924 Moved hypersweep block and functor classes into separate files 2021-10-20 14:46:23 -07:00
Gunther H. Weber
331e63fed4 Added missing LoadArrays include. 2021-10-20 14:46:23 -07:00
Gunther H. Weber
3cf68a512e Start creating test for HierarchicalHyperSweeper and fix various bugs in it 2021-10-20 14:46:23 -07:00
Oliver Ruebel
45a3570270 Fix bad array resize in HierarchicalAugmenter
Fix bad array resize in HierarchicalAugmenter to do true resize to preserve values and initalize arrays, not just allocate
Fix bad array resize in HierarchicalAugmenter::RetrieveInAttachmentPoints to do a true resize to preserve values and initalize arrays, not just allocate
2021-10-20 14:46:23 -07:00
Oliver Ruebel
77276f2847 Moved ResizeVector funtion from TreeGrafter to Types so that we can reuse it 2021-10-20 14:46:23 -07:00
Oliver Ruebel
3a48f4a8e0 Add missing array init in HierarchicalAugmenter.CopyBaseRegularStrucutre 2021-10-20 14:46:23 -07:00
Oliver Ruebel
0176f72dac Fix missing array resize in HierarchicalAugmenter::RetrieveOldSupernodes 2021-10-20 14:46:23 -07:00
Oliver Ruebel
e2423a2924 Fix array init in HierarchicalAugmenter.ResizeArrays 2021-10-20 14:46:23 -07:00
Oliver Ruebel
4bcdc66633 Specialze PrintDataType to correctly print id ArrayHandles 2021-10-20 14:46:23 -07:00
Oliver Ruebel
4c7eb4045c Fix bad array size in HierarchicalAugmenter.RetrieveOldSupernodes 2021-10-20 14:46:22 -07:00
Oliver Ruebel
51a7304318 Fix bad initalize of Superparents in HierarchicalAugmenter 2021-10-20 14:46:22 -07:00
Oliver Ruebel
d86284de5a Fix bad DIY send check in HierarchicalAugmenterFunctor 2021-10-20 14:46:22 -07:00
Oliver Ruebel
f0b03ba4b8 Clarify log message in ComputeDistributedContourTreeFunctor.h 2021-10-20 14:46:22 -07:00
Oliver Ruebel
c61379caf3 Fix HierarchicalAugmenter.DebugPrint 2021-10-20 14:46:22 -07:00
Oliver Ruebel
001050b558 Add print function for generic array handles 2021-10-20 14:46:22 -07:00
Oliver Ruebel
be3a078d91 Add logging on input Id for Fan In 2021-10-20 14:46:22 -07:00
Oliver Ruebel
70cf5eef29 Add log message for fan in partners 2021-10-20 14:46:22 -07:00
Oliver Ruebel
6d628219bc Added HierarchicalAugmenterInOutData::DebugPrint method 2021-10-20 14:46:22 -07:00
Oliver Ruebel
c87c7392db Use the correct id in HierarchicalAugmenter.Initialize
Save global Id in DistributedContourTreeBlockData to use the correct Id for HierarchicalAugmenter.Initialize
2021-10-20 14:46:22 -07:00
Oliver Ruebel
a09c55b3ab Added TODO item for HierarchicalAugmenterFunctor 2021-10-20 14:46:22 -07:00
Oliver Ruebel
236abb772b Add high-level augmetation timers 2021-10-20 14:46:22 -07:00
Oliver Ruebel
16ac89d897 Add --augmentHierarchicalTree option for the ContourTreeDistributed example 2021-10-20 14:46:22 -07:00
Gunther H. Weber
5244aade8b Moved augmentation from lambda to separate functor class to fix compile error. 2021-10-20 14:46:22 -07:00
Oliver Ruebel
2c7bda773c Port changes to HierarchicalAugmenter to add In/Out arrays for MPI exchange 2021-10-20 14:46:22 -07:00
Oliver Ruebel
35a14f3129 Fix errors in HierarchicalAugmenter
Fix CreateSuperarcsWorklet. Use standard copy to reduce complexity of CreateSuperarcsWorklet.
Fix compile errors in HierarchicalAugmenter.
Some more clean-up and optimization for HierarchicalAugmenter.CreateSuperarcsWorklet.
2021-10-20 14:46:22 -07:00
Gunther H. Weber
c6ff4a5f09 Added some comments 2021-10-20 14:46:21 -07:00
Gunther H. Weber
e9af397fb2 First implementation of hierarchical augmenter communication phase 2021-10-20 14:46:21 -07:00
Oliver Ruebel
00e906313f Fix broken array copy in HierarchicalAugmenter::Initialize 2021-10-20 14:46:21 -07:00
Oliver Ruebel
b16dc73f3d Remove broken copy / ArrayHandleDecorator while working on a fix 2021-10-20 14:46:21 -07:00
Oliver Ruebel
1b1e6fb903 Add missing throw for logic error 2021-10-20 14:46:21 -07:00
Oliver Ruebel
958b84ebf9 Temporariliy remove CreateSuperarcsWorklet call to continue build debugging 2021-10-20 14:46:21 -07:00
Oliver Ruebel
1056abecce Fix various syntax errors in HierarchicalAugmenter 2021-10-20 14:46:21 -07:00
Oliver Ruebel
df101a81bd Fix syntax error in ArrayHandleIndex call 2021-10-20 14:46:21 -07:00
Oliver Ruebel
bb853befdd Fix bad CopyIf call 2021-10-20 14:46:21 -07:00
Gunther H. Weber
ca6f0bba9c Added TOOD/FIXME for sanity check 2021-10-20 14:46:21 -07:00
Gunther H. Weber
e2fe35e129 Started adding DIY code for HierarchicalAugmenter 2021-10-20 14:46:21 -07:00
Gunther H. Weber
1128786951 Removed virtual functions to fix compile/link error 2021-10-20 14:46:21 -07:00
Oliver Ruebel
370fd5de52 Avoid ReadPortal/WritePortal to get/set individual values as possible. 2021-10-20 14:46:21 -07:00
Oliver Ruebel
2f720d5ac2 Fix docstring 2021-10-20 14:46:21 -07:00
Oliver Ruebel
ce6c09152c Added HierarchicalContourTree<FieldType>::DumpVolumes 2021-10-20 14:46:21 -07:00
Oliver Ruebel
3daab361cd Added NumOwnedRegularVertices to HierarchicalContourTree 2021-10-20 14:46:20 -07:00
Oliver Ruebel
ec7a62a75b Updated HierarchicalHyperSweeper to track instrinsic and dependent values
Updated HierarchicalHyperSweeper to track instrinsic and dependent values not just sweepValues
2021-10-20 14:46:20 -07:00
Oliver Ruebel
9dbccaae1d Port/implement HierarchicalAugmenter 2021-10-20 14:46:20 -07:00
Oliver Ruebel
a69f83f3a5 Port/implement HierarchicalHyperSweeper 2021-10-20 14:46:20 -07:00