Commit Graph

11535 Commits

Author SHA1 Message Date
Kenneth Moreland
5fd3a18de0 Merge topic 'guide-dataset-methods'
010544279 Add documentation for all of the DataSet methods

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3265
2024-10-04 09:32:19 -04:00
Kenneth Moreland
010544279e Add documentation for all of the DataSet methods 2024-10-03 16:10:40 -04:00
Kenneth Moreland
b446907a2b Merge branch 'release-2.2' 2024-10-03 16:07:00 -04:00
Kenneth Moreland
5d99375c5a Merge topic 'cell-neighborhood-deprecation-warning'
33373f4b2 Fix deprecation warning in WorkletCellNeighborhood

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !3266
2024-10-03 16:07:00 -04:00
Kenneth Moreland
44fbdd845f Merge branch 'release-2.0' into release-2.2 2024-10-03 16:07:00 -04:00
Kenneth Moreland
f90245744d Merge topic 'cell-neighborhood-deprecation-warning' into release-2.0
33373f4b2 Fix deprecation warning in WorkletCellNeighborhood

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !3266
2024-10-03 16:07:00 -04:00
Kenneth Moreland
c7f18cf5b9 Merge topic 'cell-neighborhood-deprecation-warning' into release-2.2
33373f4b2 Fix deprecation warning in WorkletCellNeighborhood

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !3266
2024-10-03 16:06:59 -04:00
Gunther Weber
5dddc877e4 Merge topic 'add/presimplification'
f5a95046a Disabled a few contour tree tests to reduce time needed
8f3e86170 Minor refactoring of tests for contour tree.
237b5ad66 Add pre-simplification for contour tree
809127ed9 (Bug)fix to suppress off-block regular nodes in Augmented Tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Gunther Weber <ghweber@lbl.gov>
Merge-request: !3227
2024-09-27 21:28:22 -04:00
Gunther H. Weber
f5a95046a8 Disabled a few contour tree tests to reduce time needed 2024-09-27 14:12:46 -07:00
Gunther H. Weber
8f3e86170d Minor refactoring of tests for contour tree. 2024-09-26 18:43:21 -07:00
Oliver Ruebel
237b5ad664 Add pre-simplification for contour tree
Add pre-simplification as mitigation for memory usage and scaling issues
when running distributed contour tree algorithm on highly complex data
sets.

Co-authored-by: Mingzhe Li <mingzhefluorite@gmail.com>
2024-09-25 17:29:04 -07:00
Oliver Ruebel
809127ed9e (Bug)fix to suppress off-block regular nodes in Augmented Tree 2024-09-25 15:49:57 -07:00
Gunther Weber
78772401b6 Merge topic 'remove-contour-tree-test'
8d0c76599 Removed no longer required test LFS files.
aed890941 Removed duplicate tests for contour tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3232
2024-09-25 17:28:30 -04:00
Kenneth Moreland
33373f4b29 Fix deprecation warning in WorkletCellNeighborhood
There was a use of a deprecated method buried in a support class of
`WorkletCellNeighborhood`. This fixes that deprecation and also adds a
missing test for `WorkletCellNeighborhood` to prevent such things in the
future.
2024-09-24 13:01:48 -04:00
Kenneth Moreland
91eac599d0 Merge topic 'flipped-contour-tris'
24f3f0858 Fixed winding of triangles of flying edges on GPUs
cbb5871ea Consolidate flying edges device cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Dan Lipsa <dan.lipsa@kitware.com>
Merge-request: !3264
2024-09-20 13:19:11 -04:00
Kenneth Moreland
24f3f08589 Fixed winding of triangles of flying edges on GPUs
The flying edges implementation has an optimization where it will traverse
meshes in the Y direction rather than the X direction on the GPU. It
created mostly correct results, but the triangles' winding was the opposite
from the CPU. This was mostly problematic when normals were generated from
the gradients. In this case, the gradient would point from the "back" of
the face, and that can cause shading problems with some renderers.

This has been fixed to make the windings consistent on the GPU with the CPU
and the gradients.

Fixes #825
2024-09-19 07:55:03 -04:00
Kenneth Moreland
cbb5871eae Consolidate flying edges device cases
The flying edges code has two main implementations: one where it
traverses the mesh in the X direction (for CPU) and one where it
traverses the mesh in the Y direction (for GPU). There were several
places in the code where the device was checked for the case to use.
This resulted in several places where the "GPU" devices had to be
listed.

Improve the code by consolidate the check to a single piece of code in
`FlyingEdgesHelpers.h` where the axis to sum structure is selected. Make
the overloads based on this structure rather than directly on the
devices.
2024-09-19 07:55:03 -04:00
Kenneth Moreland
4e5fb16d00 Merge topic 'document-field-creation'
ea44b4b50 Better document the creation of Field and CoordinateSystem

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3262
2024-09-18 09:16:42 -04:00
Kenneth Moreland
ea44b4b50d Better document the creation of Field and CoordinateSystem
The constructors for `vtkm::cont::Field` and `vtkm::cont::CoordinateSystem`
were missing from the built user's guide. The construction of these classes
from names, associations, and arrays are now provided in the documentation.

Also added new versions of `AddField` and `AddCoordinateSystem` to
`vtkm::cont::DataSet` that mimic the constructors. This adds some sytatic
sugar so you can just emplace the field instead of constructing and
passing.
2024-09-17 10:48:25 -04:00
Abhishek Yenpure
970fb4707d Merge topic 'clip-fix-up'
ca127802f Changing VTK-m clip tables Quad case 5: to avoid overlapping

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3174
2024-09-16 14:12:08 -04:00
Abhishek Yenpure
ca127802ff Changing VTK-m clip tables Quad case 5: to avoid overlapping
Fix to remedy https://gitlab.kitware.com/vtk/vtk-m/-/issues/808
  This fix changes on Case 5 to use quads instead of triangles to remedy
  the airtightness of clipping. Case 10 -- which is isometric is left
  untouched as it may cause overlaps in clip and clip inverse
  intersection.
  This MR causes the output of VTK-m to be different than VisIt and VTK
  as they suffer similar problems described in the issue.
2024-09-13 09:17:14 -07:00
Kenneth Moreland
e4f1f85d84 Merge topic 'cell-interpolation-global'
9efc8712d Add a form of CellInterpolate that operates on whole cell sets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3253
2024-09-03 08:03:45 -04:00
Kenneth Moreland
a4deead521 Merge topic 'guide-execobjects' into release-2.2
ab7c9be6f Document creating execution objects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3260
2024-08-30 08:30:23 -04:00
Kenneth Moreland
746f1d9ebf Merge branch 'release-2.2' 2024-08-30 08:30:23 -04:00
Kenneth Moreland
499ade1376 Merge topic 'guide-execobjects'
ab7c9be6f Document creating execution objects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3260
2024-08-30 08:30:23 -04:00
Kenneth Moreland
9dc0aa60ab Merge topic 'flow-test-data-header'
23bf92a51 Move the flow test data set header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !3252
2024-08-26 15:28:35 -04:00
Kenneth Moreland
ab7c9be6f8 Document creating execution objects 2024-08-26 14:54:56 -04:00
Kenneth Moreland
407024515f Merge branch 'release-2.0' into release-2.0 2024-08-13 15:56:14 -04:00
Kenneth Moreland
a2784a96fd Merge branch 'release-2.0' into release-2.2 2024-08-13 15:56:14 -04:00
Kenneth Moreland
4c2307ff43 Merge branch 'release-2.2' 2024-08-13 15:56:14 -04:00
Kenneth Moreland
a0d30881d0 Merge topic 'thrust-is_arithmetic-error' into release-2.2
744a60ee5 Fix compile error using unsupported thrust::detail::is_arithmetic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3259
2024-08-13 15:56:14 -04:00
Kenneth Moreland
d23e06e723 Merge topic 'thrust-is_arithmetic-error'
744a60ee5 Fix compile error using unsupported thrust::detail::is_arithmetic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3259
2024-08-13 15:56:14 -04:00
Kenneth Moreland
efd64aeeef Merge topic 'thrust-is_arithmetic-error' into release-2.0
744a60ee5 Fix compile error using unsupported thrust::detail::is_arithmetic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3259
2024-08-13 15:56:13 -04:00
Kenneth Moreland
1652b9f87a Merge topic 'thrust-is_arithmetic-error' into release-2.0
744a60ee5 Fix compile error using unsupported thrust::detail::is_arithmetic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3259
2024-08-13 15:56:12 -04:00
Kenneth Moreland
744a60ee56 Fix compile error using unsupported thrust::detail::is_arithmetic
I believe the most recent version of Thrust are no longer defining this
class. Instead, it is using cuda::std::is_arithmetic.
2024-08-12 14:39:02 -04:00
Vicente Bolea
f7477d4ba0 Merge topic 'fix-thrust-typo'
be6649803 ci,thrust: fix typo thrust dependency with kokkos
273485a8e ci: update latest cmake to 3.30.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3258
2024-08-05 19:03:41 -04:00
Vicente Adolfo Bolea Sanchez
be6649803d ci,thrust: fix typo thrust dependency with kokkos 2024-08-05 16:55:04 -04:00
Vicente Adolfo Bolea Sanchez
273485a8eb ci: update latest cmake to 3.30.2 2024-08-02 19:37:59 -04:00
Vicente Bolea
b579f2d41b Merge branch 'release-2.2' 2024-08-01 12:45:22 -04:00
Vicente Bolea
c8cf518ca7 Merge topic 'update-to-2.2.0'
f399a6b79 release: update version and License

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3257
2024-08-01 12:45:22 -04:00
Vicente Adolfo Bolea Sanchez
c6db921643 2.2.0 is our 17th official release of VTK-m.
The major changes to VTK-m from (previous release) can be found in:
  docs/changelog/2.2.0/release-notes.md
v2.2.0
2024-07-31 13:38:53 -04:00
Vicente Adolfo Bolea Sanchez
f399a6b79e release: update version and License 2024-07-31 13:36:04 -04:00
Vicente Bolea
d25e36e788 Merge branch 'release-2.2' into master 2024-07-31 13:33:08 -04:00
Vicente Bolea
bf4213eeb5 Merge topic 'backport-3249' into release-2.2
fe2eb56f8 ci: use the `vtkm` for macOS runners

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3256
2024-07-31 13:33:07 -04:00
Ben Boeckel
fe2eb56f8d ci: use the vtkm for macOS runners
(cherry picked from commit 3dca50053e029b3e5d573c2ad6b3e9d11c6f00fc)
2024-07-30 16:34:01 -04:00
Kenneth Moreland
9efc8712de Add a form of CellInterpolate that operates on whole cell sets
The initial implementation of `CellInterpolate` takes arguments that are
expected from a topology map worklet. However, sometimes you want to
interplate cells that are queried from locators or otherwise come from a
`WholeCellSet` control signature argument.

A new form of `CellInterpolate` is added to handle this case.
2024-07-26 13:36:15 -04:00
Kenneth Moreland
23bf92a51c Move the flow test data set header
The header file `GenerateTestDataSets.h` was located in
`vtkm/worklet/testing`. However, the only tests that used this header
are in `vtkm/filter/flow/testing`. Thus, the header file is moved to where
it is used.
2024-07-25 15:30:38 -04:00
Ben Boeckel
81522be6f7 Merge topic 'ci-tag-consistency'
3dca50053 ci: use the `vtkm` for macOS runners

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !3249
2024-07-18 01:11:05 -04:00
Vicente Bolea
300b33c063 Merge branch 'release-2.2' 2024-07-17 15:21:28 -04:00
Vicente Bolea
04cd8e1756 Merge topic 'frontier-branch'
2f0441564 ci: add setup modules job

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !3250
2024-07-17 15:21:28 -04:00