Commit Graph

7405 Commits

Author SHA1 Message Date
Kenneth Moreland
93982a0318 Move MeshQualityRelativeSizeSquared to its own filter 2022-06-23 07:53:23 -06:00
Kenneth Moreland
8df4ae52b1 Move MeshQualityScaledJacobian to its own filter 2022-06-23 07:53:22 -06:00
Kenneth Moreland
05cad24592 Move MeshQualityShapeAndSize to its own filter
Also added functions to MeshQualityArea and MeshQualityVolume to find
the average area and volume, respectively, of a dataset. This can now be
shared among metrics that need this value.

Also had to make a small change to the Run method of MeshQualityWorklet
to preserve state of the worklet.
2022-06-23 07:53:12 -06:00
Kenneth Moreland
553e627455 Move MeshQualityShape to its own filter 2022-06-23 07:53:11 -06:00
Kenneth Moreland
56ab12f117 Move MeshQualityShear to its own filter 2022-06-23 07:53:11 -06:00
Kenneth Moreland
97af85ba7b Move MeshQualitySkew to its own filter 2022-06-23 07:53:11 -06:00
Kenneth Moreland
6e4228cf23 Move MeshQualityStretch to its own filter 2022-06-23 07:53:11 -06:00
Kenneth Moreland
9f4bf93bc3 Move MeshQualityTaper to its own filter 2022-06-23 07:53:11 -06:00
Kenneth Moreland
af3b73777b Move MeshQualityWarpage to its own filter 2022-06-23 07:53:11 -06:00
Kenneth Moreland
2702ee570d Move MeshQualityVolume to its own filter
Also using the MeshQualityArea and MeshQualityVolume filters to compute
the average area/volume for other metrics.
2022-06-23 07:53:11 -06:00
Kenneth Moreland
f307d69397 Move MeshQualityArea to its own filter 2022-06-23 07:53:11 -06:00
Kenneth Moreland
ac06c00c7d Use MeshQuality filter in MIRFilter
Previously, MIRFilter directly used MeshQuality's worklet to compute
areas/volumes. However, it is not a great idea to be touching the
internal worklets of other filters, which are going to change soon.
Besides, this should speed up compilation a little bit since the mesh
quality will only have to be compiled once.
2022-06-23 07:53:11 -06:00
Li-Ta Lo
7c1573ea56 Merge topic 'contour_tree_refactor'
f3c4813f4 install worklet header
de010fb20 update examples
579b75bb0 migrate ContourTreeUniform filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Gunther Weber <ghweber@lbl.gov>
Merge-request: !2784
2022-06-22 10:08:03 -04:00
Manish Mathai
eaabcb263b Merge topic 'enhance-glyphing-types'
814ec27f1 Add MapperGlyphScalar and MapperGlyphVector mappers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2747
2022-06-15 20:17:53 -04:00
Manish Mathai
814ec27f1e Add MapperGlyphScalar and MapperGlyphVector mappers
These mappers can be used to render cell sets as glyphs. The following
glyph types are available for scalar fields:
 - Cube
 - Sphere
 - Axes
 - Quads

For vector fields:
 - Arrows
2022-06-15 15:19:53 -07:00
Li-Ta Lo
f3c4813f49 install worklet header 2022-06-09 13:08:44 -06:00
Li-Ta Lo
579b75bb04 migrate ContourTreeUniform filter 2022-06-09 11:49:49 -06:00
Gunther H. Weber
c347977119 Use test_equal_ArrayHandles instead of own test function 2022-06-08 15:28:09 -07:00
Gunther H. Weber
bfb19f14ab Start adding unit tests for vtkm::cont::Algorithm::Transform 2022-06-08 14:53:47 -07:00
Abdelilah Essiari
6a7aaa5a32 Add unit tests and refactor based on merge request discussion
Co-authored-by: Gunther H. Weber <GHWeber@lbl.gov>
2022-06-06 19:57:13 -07:00
Gunther H. Weber
f871f51cb8 Move computing branch decomposition to a separate filter 2022-06-06 19:57:13 -07:00
Oliver Ruebel
4fe495be8d Implement branch decomposition for hierarchical contour tree
Co-authored-by: Gunther H. Weber <GHWeber@lbl.gov>
2022-06-06 19:57:13 -07:00
oruebel
af5073885e Add timers to distributed contour tree; reduce data size sent during reduction
Co-authored-by: Gunther H. Weber <GHWeber@lbl.gov>
2022-06-06 19:57:13 -07:00
Gunther H. Weber
d6a7348172 Add unit test for serializing an empty ArrayHandle and fix test failure
Fix: Always serialize the size of the Buffer in vtkm/cont/internal/Buffer.cxx
but only serialize its contents, if the size differs from zero.
2022-06-06 19:52:13 -07:00
Li-Ta Lo
09bc3f426e Merge topic 'amr_refactor'
cfe4d4635 add deprecated AmrArrays.h
4f97a60d8 Update CMakeLists.txt
99d17b30a migrate AmrArray filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Roxana Bujack <bujack@lanl.gov>
Merge-request: !2775
2022-05-25 10:05:33 -04:00
Kenneth Moreland
43fe2c5ce5 Merge topic 'unknownarrayhandle-all-types'
9ea11440e Do not require `VecTraits` for `UnknownArrayHandle` components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Dave Pugmire <dpugmire@gmail.com>
Merge-request: !2778
2022-05-25 08:30:24 -04:00
Kenneth Moreland
5afafd4a4b Merge topic 'break-circular-dependency'
7749b86b2 Move MakeTestDataSet.cxx to vtkm_cont

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nicole Marsaglia <marsaglia1@llnl.gov>
Merge-request: !2779
2022-05-24 17:28:51 -04:00
Kenneth Moreland
7749b86b22 Move MakeTestDataSet.cxx to vtkm_cont
Originally `MakeTestDataSet.h` was header-only code. This was changed to
put its functionality into a library. The obvious library to put it in
was `vtkm_cont_testing`.

The problem is that there is some external code that is (unadvisably)
adding this header to their own code. This code ends up breaking because
it needed to include `vtkm_cont_testing`, which was not needed before.

As a workaround, there was a CMake interface link that caused external
code linking in `vtkm_cont` to also link in `vtkm_cont_testing`. This
works OK, but creates something of a circular dependency. CMake itself
has no problem with this, because `vtkm_cont` did not itself depend on
`vtkm_cont_testing`; only things that linked to `vtkm_cont` also had to
link to `vtkm_cont_testing`.

Unfortunately, some Ascent CMake script was trying to trace down
dependencies and ran into an infinite loop. So this solution was not so
great for them.

Get around the problem by just adding the `MakeTestDataSet` code
directly to `vtkm_cont` (for now).
2022-05-24 14:43:10 -06:00
Kenneth Moreland
9ea11440eb Do not require VecTraits for UnknownArrayHandle components
Whan an `UnknownArrayHandler` is constructed from an `ArrayHandle`, it uses
the `VecTraits` of the component type to construct its internal functions.
This meant that you could not put an `ArrayHandle` with a component type
that did not have `VecTraits` into an `UnknownArrayHandle`.

`UnknownArrayHandle` now no longer needs the components of its arrays to
have `VecTraits`. If the component type of the array does not have
`VecTraits`, it treats the components as if they are a scalar type.
2022-05-24 13:36:00 -06:00
Li-Ta Lo
cfe4d4635d add deprecated AmrArrays.h 2022-05-20 16:05:36 -06:00
Li-Ta Lo
4f97a60d8f Update CMakeLists.txt 2022-05-20 17:41:04 -04:00
Li-Ta Lo
99d17b30a0 migrate AmrArray filter 2022-05-20 15:07:34 -06:00
Li-Ta Lo
ebfbeabc8a Merge topic 'mir_filter'
7d83a7dc5 remove unreachable code
98e0f4c25 remove shared states from MIRFilter instances
1d64b1045 added deprecated MIRFilter.h
7903cee23 Update CMakeLists.txt
7e6e5f0b8 Update MIRFilter.cxx
911c66377 Merge branch 'master' into mir_filter
ac078c8c0 call DoMapeField
0a0e30858 Migrate MIR filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2770
2022-05-20 11:25:27 -04:00
Li-Ta Lo
7d83a7dc5c remove unreachable code 2022-05-19 17:44:46 -06:00
Li-Ta Lo
98e0f4c259 remove shared states from MIRFilter instances 2022-05-19 16:59:34 -06:00
Li-Ta Lo
1d64b1045c added deprecated MIRFilter.h 2022-05-19 10:44:42 -06:00
roxana bujack
21934c6f50 squash and rebase all commits from merge request 2728 2022-05-19 11:28:13 +02:00
Li-Ta Lo
7903cee230 Update CMakeLists.txt 2022-05-18 17:58:29 -04:00
Li-Ta Lo
7e6e5f0b86 Update MIRFilter.cxx 2022-05-18 17:57:59 -04:00
Li-Ta Lo
911c663774 Merge branch 'master' into mir_filter 2022-05-18 08:57:10 -06:00
Li-Ta Lo
ac078c8c0f call DoMapeField 2022-05-18 08:55:28 -06:00
Li-Ta Lo
2b102e2b7c Merge topic 'probe_refactor'
849106762 remove include CellDeepCopy
4108febd3 remove #include functional
daaac78f1 minor changes based on code review
aecdd7705 Update vtkm/filter/resampling/testing/CMakeLists.txt
38000ed6d Use ALL_BACKENDS for unit test
ab09f77b7 migrate Probe filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2771
2022-05-18 10:48:37 -04:00
Li-Ta Lo
849106762e remove include CellDeepCopy 2022-05-18 07:15:00 -06:00
Li-Ta Lo
daaac78f15 minor changes based on code review 2022-05-18 05:59:07 -06:00
Li-Ta Lo
aecdd77053 Update vtkm/filter/resampling/testing/CMakeLists.txt 2022-05-17 10:42:33 -04:00
Li-Ta Lo
38000ed6df Use ALL_BACKENDS for unit test 2022-05-17 06:07:03 -06:00
Li-Ta Lo
ab09f77b7c migrate Probe filter 2022-05-16 14:55:14 -06:00
Li-Ta Lo
0a0e30858e Migrate MIR filter 2022-05-16 09:26:08 -06:00
Kenneth Moreland
746d1efa4f Use Buffer objects for dispatcher base test
`UnitTestDispatcherBase` previously used arrays from `std::vector` to
test dispatching data to worklets. This only works for devices that have
unified memory with the host.

Change the test to use `vtkm::cont::internal::Buffer` objects and
properly copy data to/from the device for devices that have separate
memory spaces.
2022-05-13 16:02:59 -04:00
Kenneth Moreland
3ba13c5cc4 Re-enable hip builds
There were several tests that were disabled for hip because they either
took too long to compile or were failing. We are getting closer to
making everything work, so re-enable this part of the build.
2022-05-12 16:00:30 -04:00