Commit Graph

7286 Commits

Author SHA1 Message Date
Robert Maynard
40c0c0fefd Allow for easier overloads of scheduling_range
This is needed to support custom types that need 3D scheduling
or to call custom methods to get the 1D scheduling size
2020-01-28 11:17:42 -05:00
Sudhanshu Sane
4d358e5b29 Remove coordinates from class member variable list 2020-01-28 02:05:10 -08:00
Sudhanshu Sane
e6647efaf0 Fix condition to populate coordinate variables 2020-01-27 21:12:23 -08:00
Oliver Ruebel
2134acd9e6 Unit test different augmentation settings. Fix parameter warning 2020-01-27 14:17:39 -08:00
Oliver Ruebel
787b6519ab Fix shadowing parameter warning in HyperArcSuperNodeComperator 2020-01-27 13:26:02 -08:00
Oliver Ruebel
446f046133 Place ContourTreeBlockData in an approbriate namespace 2020-01-27 13:22:26 -08:00
Oliver Ruebel
d1d7b56411 Update docs for ContourTreeUniformAugmented worklet 2020-01-27 03:13:26 -08:00
Oliver Ruebel
f70b63f805 Add Doxygen-style docs for the ContourTreeUnfiformAugemented filter 2020-01-27 02:57:02 -08:00
Oliver Ruebel
56df1b9b32 Renamed ActiveGraph.nSupernodes, nHypernodes member var for VTKm style compliance 2020-01-23 18:48:20 -08:00
Oliver Ruebel
3f84635c75 Renamed ActiveGraph.activeEdges, activeVertices, superID, hyperID member var for VTKm style compliance 2020-01-23 18:36:47 -08:00
Oliver Ruebel
31e2fc559d Renamed ActiveGraph.edgeMear. edgeFare, and edgeSorter member var for VTKm style compliance 2020-01-23 18:17:58 -08:00
Oliver Ruebel
a67c2db6b7 Renamed ActiveGraph.outdegree and ActiveGraph.firstEdge member var for VTKm style compliance 2020-01-23 18:07:14 -08:00
Oliver Ruebel
09a4eeeaf6 Renamed globalIndex member var for VTKm style compliance 2020-01-23 17:48:31 -08:00
Oliver Ruebel
c7f8f9393b Renamed isJoinGraph member var for VTKm style compliance 2020-01-23 17:43:26 -08:00
Oliver Ruebel
db1104a258 Renamed ContourTreeMaker.contourTree for compliance with VTKm style 2020-01-23 17:33:58 -08:00
Oliver Ruebel
e08667552d Updated names in ContourTreeMaker for compliance with VTKm 2020-01-23 17:20:31 -08:00
Oliver Ruebel
70f0b96bd8 Update names in ContourTree.h to comply with VTKm style 2020-01-23 11:32:33 -08:00
Oliver Ruebel
7ced203f6a Update names in MergeTree (and matching names in other classes) to comply with VTKm style 2020-01-23 10:46:56 -08:00
Oliver Ruebel
6bfd119220 Update var/func names in all of activegraph to comply with VTKm style 2020-01-23 03:44:25 -08:00
Oliver Ruebel
4de9647688 Update var/func names in all of contourtreemaker to comply with VTKm style 2020-01-23 03:30:22 -08:00
Oliver Ruebel
bea6997d58 Update var/func names in all of mesh_dem_meshtypes to comply with VTKm style 2020-01-23 03:21:01 -08:00
Oliver Ruebel
fed9c792ca Update func/var names in Mesh_DEM_Triangulation for VTKm style 2020-01-23 01:51:03 -08:00
Oliver Ruebel
8d25b8fa35 Update names of print functions for VTKm syle compliance 2020-01-23 00:56:02 -08:00
Oliver Ruebel
111ee415b0 Updated naming in MultiBlockContourTreeHelper to match VTKm style 2020-01-23 00:39:43 -08:00
Oliver Ruebel
fcaf55e33e Updated naming in SpatialDecomposition to match VTKm style 2020-01-23 00:31:15 -08:00
Oliver Ruebel
56f5b369fa Updated naming in ContourTreeBlockData to match VTKm style 2020-01-23 00:23:25 -08:00
Oliver Ruebel
1fa1410324 Updated names in MeshExtrema to match VTKm style 2020-01-23 00:03:36 -08:00
Oliver Ruebel
fee363232d Updated names in ArrayTransforms.h to fit VTKm style 2020-01-22 23:44:00 -08:00
Oliver Ruebel
3ba516d70e Updated print functionname to VTKm style and remove unused functions 2020-01-22 23:30:44 -08:00
Oliver Ruebel
7598696656 Remove unused constexpr printCols 2020-01-22 23:21:16 -08:00
Oliver Ruebel
ff3e20dcad Update functionnames in contourtree_augmented/Types.h to match VTKm style 2020-01-22 23:15:28 -08:00
Oliver Ruebel
91941444f9 Fix memory leak in distributed parallel contour tree filter 2020-01-22 16:41:52 -08:00
Oliver Ruebel
c51587f011 Moved EulerTour to processcontour folder/namespace 2020-01-22 15:07:30 -08:00
Oliver Ruebel
bdabb282b3 Fix naming of functions/variable in vtkm/worklet/contourtree_augmented/processcontourtree 2020-01-22 14:54:52 -08:00
Kenneth Moreland
ec010d2e8d Merge topic 'no-deprecated-nvcc-vs'
fb01d38a0 Disable deprecated attribute when using nvcc under VS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1949
2020-01-22 17:49:08 -05:00
Oliver Ruebel
236da581e3 Rename include guards to comply with vtk_m_ naming convention 2020-01-22 14:04:11 -08:00
Robert Maynard
f2aa6ad5be Merge topic 'gcc_61_ice_openmp_and_optimizations'
dc86ac207 Avoid a GCC 6.1 compiler regression that occurs when openmp is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1950
2020-01-22 14:40:00 -05:00
Robert Maynard
dc86ac2077 Avoid a GCC 6.1 compiler regression that occurs when openmp is enabled 2020-01-22 11:06:54 -05:00
Kenneth Moreland
fb01d38a09 Disable deprecated attribute when using nvcc under VS
The nvcc compiler under visual studio seems to give the error `attribute
does not apply to any entity` when you try to use the `[[deprecated]]`
attribute. So disable for this compiler configuration.
2020-01-22 07:52:59 -07:00
Oliver Ruebel
5db7eb6969 Replace use of PPP2 acronym in names to comply with coding style 2020-01-22 01:40:49 -08:00
Oliver Ruebel
30ba214f21 Remove use of DEGUG_TIMING var in ContourTreeApp 2020-01-22 01:22:54 -08:00
Oliver Ruebel
43aae4870b Replace tracking of timings in ContourTree with logging 2020-01-22 01:11:45 -08:00
Oliver Ruebel
7ed921d247 Use logging instead of cout in ContourTreeApp 2020-01-21 19:38:29 -08:00
Oliver Ruebel
66ed92e4d2 Use vtkm::cont::Initialize to init logging,device,help 2020-01-21 17:31:44 -08:00
Robert Maynard
579a4bab2f Merge topic 'correct_vtkm_cuda_cellset_host_device_warnings'
3e99b1776 Correct host/device warnings in CellSetPermutation found by VTK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1947
2020-01-21 16:41:17 -05:00
Robert Maynard
3e99b17762 Correct host/device warnings in CellSetPermutation found by VTK 2020-01-21 15:09:48 -05:00
Robert Maynard
9787be3b84 Merge topic 'correct_unused_variable_warning_color_table'
3f02558fc correct warnings in color table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1946
2020-01-20 10:37:29 -05:00
Sudhanshu Sane
2e2a847f55 Change Lagrangian output format to structured grid 2020-01-16 23:54:47 -08:00
Robert Maynard
3f02558fc2 correct warnings in color table 2020-01-16 17:33:22 -05:00
Robert Maynard
f395e084d8 Merge topic 'correct_warnings_from_osx_dashboard'
b9516c116 Correct CellSetStructured compile failures
00235874d Suppress more warning types from thirdparty includes
a52af2d13 Correct double to float warning in CellAspectFrobeniusMetric
cf5ebfb16 Suppress warning about extension use, since all compilers support it
27739660b Add missing constructors/assignment operators
123f8b01a Mark virtual destructors as override where applicable
54118dfca Use noexcept instead of throw() as it was deprecated in c++11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !1943
2020-01-15 15:27:18 -05:00