Commit Graph

666 Commits

Author SHA1 Message Date
Dave Pugmire
0800f19b43 Fix the particle advection examples. 2022-07-29 10:09:13 -04:00
Dave Pugmire
767b6c0048 CUDA fixes move device copy into .cxx file. 2022-07-28 13:28:09 -04:00
Dave Pugmire
d2aacfc07e Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into remove_templates_from_streamline_filters 2022-07-25 11:52:45 -04:00
Dave Pugmire
9b0379722a Fix example code. 2022-07-25 10:01:13 -04:00
Gunther H. Weber
4feba2f5d3 Update includes for distributed contour tree app to filter refactor 2022-07-08 15:36:33 -07:00
Gunther H. Weber
1b1636b6d8 Update includes for distributed contour tree app to filter refactor 2022-07-01 19:10:20 -04:00
Gunther H. Weber
2f488b485d Add missing HDF5 include/link definitions distributed contour tree app 2022-07-01 19:10:19 -04:00
oruebel
5aed80d7d3 Fix HDF5 float data read bug 2022-07-01 19:10:19 -04:00
oruebel
a30d115789 Use Parallel HDF5 and fix axis swap bug 2022-07-01 19:10:18 -04:00
oruebel
da38ff2a61 Update distributed app 2022-07-01 19:10:17 -04:00
oruebel
ae8de9e25d Swap HDF5 dims to match presplit data handling 2022-07-01 19:10:17 -04:00
oruebel
8d1d713dce Update split data 3D to also support export to HDF5 2022-07-01 19:10:16 -04:00
oruebel
e9fcd7ca78 Moved ContourTree I/O to new module and added HDF5 I/O 2022-07-01 19:10:16 -04:00
Li-Ta Lo
0ce48aaaed restore damage CLion did to #include 2022-06-30 09:31:20 -06:00
Li-Ta Lo
d1cede4d2b migrated ContourTreeUniformDistributed filter 2022-06-29 14:58:10 -06:00
Li-Ta Lo
7c8dbcde28 migrated ContourTreeAugmented filter 2022-06-27 18:01:42 -06:00
Li-Ta Lo
de010fb20e update examples 2022-06-09 12:26:30 -06: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
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
4108febd39 remove #include functional 2022-05-18 06:34:01 -06:00
Li-Ta Lo
ab09f77b7c migrate Probe filter 2022-05-16 14:55:14 -06:00
Kenneth Moreland
d203522324 Remove extra target information from demo example
Through hard work, the simple demo example no longer needs to be
compiled with a device compiler, and thus it is no longer necessary to
add the special CMake for it. In fact, adding such information can be
problematic in some cases.
2022-05-13 16:12:33 -04:00
Vicente Adolfo Bolea Sanchez
53e22ab1d3 smoke_test: Remove version condition 2022-04-21 15:20:36 -04:00
Kenneth Moreland
f8f41e0ef5 Update use of field association enumerations
The enumerations in `vtkm::cont::Field::Association` were renamed in the
previous commit. The old names still exist, but are deprecated. Change
the rest of the code to use the new names.
2022-03-17 11:02:37 -06:00
Kenneth Moreland
5b7893a3f7 Support deprecated MeshQuality features
Reenable the `vtkm::filter::CellMetric` class and
`vtkm::filter::MetricNames` static variable for backward compatibility.
(Both are of course marked deprecated.)

Also, adjust names in the new `vtkm::filter::mesh_info::CellMetric` to
conform with the rest of VTK-m style for scoped enums.
2022-02-16 11:36:13 -07:00
Li-Ta Lo
7553285a54 Merge topic 'geometry_refine'
a462552c2 use CreateResult that accepts a CoordSystem
f09032aaa migrate geometry refinement filters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2714
2022-02-15 11:00:23 -05:00
Li-Ta Lo
f09032aaaf migrate geometry refinement filters 2022-02-11 20:52:43 -07:00
Vicente Adolfo Bolea Sanchez
b2c3da8f6a CTEST: add smoke test 2022-02-12 00:16:30 +00:00
Li-Ta Lo
ee0f112f0e migrate mesh info filters 2022-02-08 07:18:24 -07:00
Li-Ta Lo
cdc4c29c5f renamve vector_calculus -> vector_analysis 2022-01-31 08:58:38 -07:00
Li-Ta Lo
59cc8cbaeb Migrate Gradient filter 2022-01-30 12:18:22 -07:00
Li-Ta Lo
175f9010a5 Merge branch 'master' into new_contour 2022-01-26 13:43:46 -07:00
Li-Ta Lo
c4a7444b02 migrate Histogram filter 2022-01-17 09:18:42 -07:00
Li-Ta Lo
fa0905e3e5 migrate clean_grid and extract_entity filters 2022-01-13 11:14:48 -07:00
Li-Ta Lo
93a85d01db update example/clipping 2022-01-11 08:08:42 -07:00
Li-Ta Lo
3c700259a1 migrate Contour, ClipWithField and Slice 2022-01-10 20:39:43 -07:00
Li-Ta Lo
28fce9e259 add namespace 2022-01-06 16:15:54 -07:00
Li-Ta Lo
f5bbc6fc83 migrate clean_grid and extract_entity filters 2022-01-06 14:52:27 -07:00
Kenneth Moreland
4650a1da96 Deprecate old methods from DynamicCellSet
The `DynamicCellSet` (and the related `DynamicCellSetBase`) are
deprecated and replaced with `UnknownCellSet` (and `UncertainCellSet`).
Thus, `UnknownCellSet` has some methods inherited from `DynamicCellSet`
but replaced with other functionality. These methods are now marked as
deprecated and their use is removed.
2022-01-05 08:18:17 -07:00
Kenneth Moreland
0b84787f78 Deprecate DynamicCellSet and remove from code
The `DynamicCellSet` class is now marked as deprecated (as is the header
that contains it), and all non-deprecated code is moved to its
`UnknownCellSet` replacement.

Also added a deprecation warning for the VariantArrayHandle.h header
file and deleted a couple inappropriate uses of it.
2022-01-04 15:38:18 -07:00
Gunther H. Weber
2b6fd71c5b Make volume metric data filter output and print tree in app; general clean up 2021-10-20 14:46:24 -07:00
Gunther H. Weber
fd91947fb8 Added scripts to test volume computation 2021-10-20 14:46:24 -07:00
Gunther H. Weber
5ad51b5289 Clean up test script 2021-10-20 14:46:24 -07:00
Gunther H. Weber
17a8cf16a2 Added verification code to test results of contour tree app. 2021-10-20 14:46:24 -07:00
Oliver Ruebel
16ac89d897 Add --augmentHierarchicalTree option for the ContourTreeDistributed example 2021-10-20 14:46:22 -07:00
Gunther H. Weber
e2fe35e129 Started adding DIY code for HierarchicalAugmenter 2021-10-20 14:46:21 -07:00
Kenneth Moreland
03a4750a3f Change Oscillator output field name to oscillating 2021-10-05 08:20:27 -06:00
Kenneth Moreland
ea1a55359f Name tangle source fields appropriately
The `Tangle` source would create a point field generically named
`nodevar`. This name was not indicitive of the data or its source. Thus,
the output point field has been renamed `tangle`.

The `Tangle` source was also creating a cell field (named `cellvar`).
This field was really just a mirror of the cell indices (counting from 0
on up). This field has been removed from the input. If you want such a
field, you can now use the `GenerateIds` filter to add it to any data
set.
2021-10-04 13:44:27 -06:00
Nickolas Davis
9baa7cd9fa Implement tbb runtime device configuration and update vtkm to use it 2021-09-20 10:24:23 -06:00
Kenneth Moreland
32870353bc Remove use of deprecated items from StreamlineMPI example 2021-09-08 08:57:13 -06:00
Kenneth Moreland
264a8a4b6c Remove dependence of examples on testing files
The testing files (even the headers) are not available if
`VTKm_ENABLE_TESTING` is off.

Mostly, the testing was used to generate example data sets. Instead,
change the examples to load data files.
2021-09-08 08:54:15 -06:00
Nickolas Davis
5530d86e4a update cuda examples to use RuntimeDeviceConfiguration 2021-09-02 09:17:36 -06:00
Kenneth Moreland
69bacdfca8 Fix deprecation warning in histogram example
The examples do not get compiled as often as the test, so minor issues
sometimes creep in. The histogram example was still using some
deprecated methods.
2021-08-06 06:53:29 -06:00
Gunther H. Weber
1437a2e04f Use --vtkm-device instad of -d in test script 2021-06-28 15:44:43 -07:00
Gunther H. Weber
36a7f8e61a Fix NumPy deprecation warning in helper script 2021-06-28 15:44:42 -07:00
Gunther H. Weber
102e640f33 Remove obsolete debug output from distributed contour tree app 2021-06-28 11:42:45 -07:00
Nick Thompson
f1cf6c762a Refactor to more idiomatic use of worklets. 2021-04-09 14:56:19 -04:00
Nick Thompson
7b95ef5975 Refactor the structs to classes. 2021-04-09 14:54:12 -04:00
Nick Thompson
eac6c21c84 Workletize the logistic map. 2021-04-09 12:42:40 -04:00
Kenneth Moreland
a6725b3acd Remove use of deprecated ImplicitFunctions with virtual methods
Unfortunately, this introduces a backward-incompatible change with the
filters that use ImplicitFunctions. Before, they would get an
ImplicitFunctionHandle. This class is deprecated, and there is no easy
way to get back the actual type of implicit function stored in it.
2021-02-22 06:40:02 -07:00
Kenneth Moreland
047d79672a Fix CUDA compilation error with Lagrangian filter
CUDA architecture has a limited amount of memory available for
constants. The CUDA compiler uses this space to hold constants for some
optimizations. However, for large kernels, the number of constants
needed might be larger than the constant space available. For these
conditions, you have to disable this form of optimization with the `-
Xptxas --disable-optimizer-constants` flags.

Currently, the only file that seems to have this issue is the test for
the Lagrangian filter. Someone should take a closer look to see if this
filter in particular is making unnecessarily large worklet/kernel. (In
particular, why does the Lagrangian filter have a larger kernel than the
streamline and stream surface filters?)

If this occurance happens more often, we might need to add some ways to
configure it in the build.
2021-02-16 13:25:11 -07:00
Kenneth Moreland
1faed3712e Remove the use of ResetTypes for ArrayCopy
It used to be the case where you needed to call `ResetTypes` on a
`VariantArrayHandle` before using `ArrayCopy` to limit the types it gets
compiled for. However, there is now a general form for
`UnknownArrayHandle`, so `ResetTypes` no longer does anything useful in
this case. Remove the use of that.
2021-02-02 17:34:08 -07:00
Kenneth Moreland
26ea2ab420 Break circular dependency of ArrayCopy.h and UnknownArrayHandle.h
The circular dependency came from UnknownArrayHandle.h needing
VTKmDefaultTypes.h, which needed all the cell set types. Some of those
cell sets used ArrayCopy in templated functions. Changed those functions
to directly deep copy the ArrayHandle.
2021-02-02 17:33:08 -07:00
Gunther H. Weber
7ed0cd1562 Fix deprecation warning 2021-02-02 13:46:14 -08:00
Oliver Ruebel
c9af28756c Fix ValueType error in pre-split data read 2021-02-02 13:46:01 -08:00
Kenneth Moreland
8b133288ce Fix deprecation warnings
There was an error that caused deprecation warnings in VTK-m to be
suppressed, which meant that many uses of deprecated features went
unnoticed. This fixes those deprecation warnings.

The majority of the warnings were caused by the use of the deprecated
`Cast`, `CopyTo`, and `ResetTypes` methods of `UnknownArrayHandle` (or
`VariantArrayHandle`). Both `Cast` and `CopyTo` have been subsumed by
`AsArrayHandle` (to make the functionality more clear). `ResetTypes` now
requires a second template argument to define the storage types to try.

Also fixed some issues with `SerializableField` being deprecated.
This class is no longer necessary because `Field` can now be directly
serialized.
2021-01-26 07:56:39 -07:00
Nick Thompson
c6c4492469 Fix CUDA build for logistic map example. 2021-01-19 15:20:58 -05:00
Nick Thompson
18a6b12509 Merge topic 'logistic'
61522fde7 Add #includes and explicitly identify the field name.
1bad28a3e Logistic map as an example of how to use the ImageWriter.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nickolas Davis <nadavi@sandia.gov>
Merge-request: !2385
2021-01-19 14:42:42 -05:00
Nick Thompson
61522fde7b Add #includes and explicitly identify the field name. 2021-01-19 08:13:35 -05:00
Nick Thompson
1bad28a3ec Logistic map as an example of how to use the ImageWriter. 2021-01-16 15:13:33 -05:00
Kenneth Moreland
11a4c9867e Change Field to hold UnknownArrayHandle rather than VariantArrayHandle
The `VariantArrayHandle` will soon be deprecated for its replacement of
`UnknownArrayHandle`. Thus, `Field` and related classes should start
using the new `UnknownArrayHandle`.
2021-01-14 17:01:22 -07:00
Oliver Ruebel
6db948c685 Remove commented ifdef guard 2020-12-02 14:29:17 -08:00
Oliver Ruebel
c18f5bb5f7 Automatically enable --useFullBoundary option when using marching cubes 2020-12-02 14:29:17 -08:00
Oliver Ruebel
f536b825e4 Remove unused code in distributed contour tree app 2020-12-02 14:29:17 -08:00
Gunther H. Weber
a868b02bdb Add --saveTreeCompilerData option to hact_test.sh 2020-12-02 14:29:17 -08:00
Gunther H. Weber
226606276d Temprarily print error message when trying to use MC connectvitiy without full boundary 2020-12-02 14:29:17 -08:00
Oliver Ruebel
08447c24b1 Add support for using only necessary boundary vertices 2020-12-02 14:29:16 -08:00
Gunther H. Weber
4b14c84ec5 Fix 3D split data Python helper tool. 2020-12-02 14:29:16 -08:00
Oliver Ruebel
a75e539686 Add barriers in distributed contour tree example to improve timing 2020-12-02 14:29:16 -08:00
Oliver Ruebel
94f4fcb408 Added saveTreeCompilerData option for distributed contour tree app example 2020-12-02 14:29:15 -08:00
Oliver Ruebel
17f2f845e7 Minor fixed for performane logging 2020-12-02 14:29:15 -08:00
Oliver Ruebel
b4ac4cdef9 Made log levels and summary forwarding configurable in distributed contour tree example 2020-12-02 14:29:15 -08:00
Oliver Ruebel
d71259fdb7 Add contour tree, boundary tree, and interior forest array stat print 2020-12-02 14:29:15 -08:00
Gunther H. Weber
0ac6707269 Fix reading BOV files and depracation warning. 2020-12-02 14:29:14 -08:00
Gunther H. Weber
8b00e8ec48 Add command line option to select pre split files at runtime. 2020-12-02 14:29:14 -08:00
Oliver Ruebel
4f8c28a82a Make dot print configurable 2020-12-02 14:29:13 -08:00
Gunther H. Weber
c247c7d0e3 Save block extents and block index to files and read them instead of approximating them 2020-12-02 14:29:13 -08:00
Gunther H. Weber
391dba57e2 Add VTK-m copyright statement to tree compiler 2020-12-02 14:29:12 -08:00
Gunther H. Weber
8b21a8e07d Add test scripts to run tests via example application. 2020-12-02 14:29:12 -08:00
Gunther H. Weber
7a77b1ad89 Added serial (via DIY) unit test for distributed contour tree filter. 2020-12-02 14:29:12 -08:00
Gunther H. Weber
e007405fee Read blocks per dim from file instead of trying to figure it out via approximation 2020-12-02 14:29:12 -08:00
Gunther H. Weber
7661b17e5b Return fields required by TreeCompiler as vtk-m data set from filter. 2020-12-02 14:29:12 -08:00
Gunther H. Weber
f433790a17 Ported distributed contour tree prototype to vtk-m 2020-12-02 14:29:11 -08:00
Gunther H. Weber
1074c0172b Commented out incomplete code creating a warning 2020-09-18 06:33:09 -07:00
Gunther H. Weber
af697e4527 Use std::swap instead of manual swap 2020-09-15 13:46:11 -07:00
Gunther H. Weber
991f7a85ad Refactor mesh classes: switch from row/col/slice to vtkm::Id2/Id3 2020-09-15 11:15:27 -07:00
Dave Pugmire
596ec20e90 Change particle type in examples 2020-08-26 09:36:09 -04:00
Kitware Robot
cf0cdcf7d1 clang-format: reformat the repository with clang-format-9 2020-08-24 14:01:08 -04:00