Commit Graph

10437 Commits

Author SHA1 Message Date
Kenneth Moreland
af52d63296 Merge topic 'deprecate-old-filters'
de2f2b59b Deprecate old filter base classes and supporting classes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2872
2022-09-27 11:04:52 -04:00
Kenneth Moreland
de2f2b59ba Deprecate old filter base classes and supporting classes 2022-09-27 06:52:44 -06:00
Kenneth Moreland
b6d54eb612 Merge topic 'transfer-to-ogl-deprecated-use'
e36d908a4 Remove use of deprecated features in TransferToOpenGL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2871
2022-09-27 08:38:10 -04:00
Gunther Weber
ca9827ca24 Merge topic 'replace-decomposition-cta'
49dd19408 Do not overthink ComputeNumberOfBlocksPerAxis
e2968ca24 Revised ComputeNumberOfBlocksPerAxis inspired by Ken Moreland's suggestion
ede6bb001 Replace the way data is split in contour tree augmented example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2519
2022-09-26 13:33:34 -04:00
Kenneth Moreland
e36d908a49 Remove use of deprecated features in TransferToOpenGL
The `TransferToOpenGL` function was using a deprecated method to
determine on which device an `ArrayHandle` was installed. Update the
function to use the replacement methods.
2022-09-26 09:14:08 -06:00
Gunther H. Weber
49dd19408f Do not overthink ComputeNumberOfBlocksPerAxis 2022-09-23 18:00:03 -07:00
Gunther H. Weber
e2968ca244 Revised ComputeNumberOfBlocksPerAxis inspired by Ken Moreland's suggestion 2022-09-23 15:08:46 -07:00
Gunther H. Weber
ede6bb0016 Replace the way data is split in contour tree augmented example 2022-09-23 15:08:41 -07:00
Vicente Bolea
0df578eb84 Merge topic 'fix_gcc11_crusher_build_error'
4c708ac66 Merge branch 'upstream-diy' into fix_gcc11_crusher_build_error
a0083af63 diy 2022-09-14 (496253d7)
95231cd15 Update diy/update.sh

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2856
2022-09-23 16:09:31 -04:00
Vicente Bolea
8469ff6c85 Merge topic 'redo_insitu_benchmark'
613b4d44b Switch how InSitu benchmark iterates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2857
2022-09-23 16:08:54 -04:00
Ryan Krattiger
4c708ac661 Merge branch 'upstream-diy' into fix_gcc11_crusher_build_error
# By Diy Upstream
* upstream-diy:
  diy 2022-09-14 (496253d7)
2022-09-23 13:10:01 -05:00
Diy Upstream
a0083af63f diy 2022-09-14 (496253d7)
Code extracted from:

    https://gitlab.kitware.com/third-party/diy2.git

at commit 496253d714f25a82377aa10c55391edc93597922 (for/vtk-m-20220914-master-g0f1c387).
2022-09-23 13:10:01 -05:00
Ryan Krattiger
95231cd155 Update diy/update.sh 2022-09-22 10:13:50 -05:00
Sujin Philip
16887ff156 Merge topic 'improve-threshold'
924b00193 Add more features to Threshold

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2867
2022-09-21 14:15:00 -04:00
Kenneth Moreland
6643cf55f8 Merge topic 'lagrangian-to-new-filter'
962cad388 Fix Fields and CoordinateSystems of Lagrangian filter outputs
ee31217da Convert LagrangianStructures filter to NewFilter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2868
2022-09-21 10:37:46 -04:00
Kenneth Moreland
962cad3882 Fix Fields and CoordinateSystems of Lagrangian filter outputs
The original versions of Lagrangian and LagrangianStructures mapped the
global fields from inputs to output. Restore that capability.

Also changed the output CoordinateSystem of Lagrangian to be uniform
points instead of rectilinear points. The points were uniformly spaced
anyway, so it is more clear to have uniform points in the coordinate
system.
2022-09-20 15:27:49 -06:00
Sujin Philip
924b001938 Add more features to Threshold
1. Now we can threshold for values below or above a given value, instead
   of just between two values.
2. Supports multi-component fields instead of just scalar fields.
3. The threshold criteria can be tested against just one specified
   component or against all of the components, and pass if any or all of
   the components pass.
4. The results of the threshold operation can be inverted.
2022-09-20 15:48:20 -04:00
Dave Pugmire
ee31217da5 Convert LagrangianStructures filter to NewFilter 2022-09-20 13:40:50 -06:00
Abhishek Yenpure
3ae5302c3d Merge topic 'shading_scalarRenderer'
35f15f49d Merge branch 'shading_scalarRenderer' of https://gitlab.kitware.com/nicolemarsaglia/vtk-m into shading_scalarRenderer
add81512d 64->32 float type
d77ba3b20 refactor
d399e5d38 change comment
5e361acea abmient -> ambient
0f0704a0b update to vtkm1.8

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Nicole Marsaglia <marsaglia1@llnl.gov>
Merge-request: !2804
2022-09-13 20:34:41 -04:00
Nicole Marsaglia
35f15f49dc Merge branch 'shading_scalarRenderer' of https://gitlab.kitware.com/nicolemarsaglia/vtk-m into shading_scalarRenderer 2022-09-13 12:39:58 -07:00
Gunther Weber
8b9f2256f1 Merge topic 'contour-tree-explicit-no-such-element-comparator'
659734663 Limit arguments of ArrayHandle to to type vtkm::Id
72b0b9035 Fix compile error in debug code due to member name change
34f378ad7 Explicit comparator for moving NO_SUCH_ELEMENT to end of array

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2645
2022-09-13 08:47:27 -04:00
Gunther H. Weber
6597346638 Limit arguments of ArrayHandle to to type vtkm::Id 2022-09-13 10:58:48 +02:00
Gunther H. Weber
72b0b90350 Fix compile error in debug code due to member name change 2022-09-13 10:58:47 +02:00
Gunther H. Weber
34f378ad7e Explicit comparator for moving NO_SUCH_ELEMENT to end of array 2022-09-13 10:58:47 +02:00
Sujin Philip
e337f5c10e Merge topic 'slice-non-zero'
fa574fdf4 Slice should support slicing along non-zero values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2865
2022-09-12 22:52:35 -04:00
Sujin Philip
fa574fdf46 Slice should support slicing along non-zero values
Earlier we were explicitly setting the slice-at value to zero. Now the
filter is more flexible.
2022-09-12 16:09:07 -04:00
Sujin Philip
99aca868e0 Merge topic 'clip-use-value-as-offset-2'
e885cde0e Add support for Offset in ClipWithImplicitFunction
e85f403fd Update paramter constness to follow vtk-m style in Clip.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2864
2022-09-12 11:29:15 -04:00
Mark Bolstad
613b4d44b7 Switch how InSitu benchmark iterates
Previous version had a hard-coded loop for updating the dataset. This change relenquishes control over to google benchmarks. Running it from the command-line will iterate each sub-benchmark a different number of iterations depending on how long each individual test takes. The number of iterations can be increased (but not controlled) by increasing the minimum time for each test. Alternatively, using the "repetitions" argument, you can control exactly how many times the benchamrks are run.

See the README for InSitu that throughly documents the arguments.
2022-09-12 09:24:47 -06:00
Sujin Philip
e885cde0eb Add support for Offset in ClipWithImplicitFunction
This allows the user to specify a value of the implcit function to clip
at. The default is 0, which gives the same result as before.
2022-09-12 09:40:08 -04:00
Sujin Philip
e85f403fd4 Update paramter constness to follow vtk-m style in Clip.h
There were several cases where parameters of basic types were declared
const-by-value, instead of just by-value which is the convention
followed in vtk-m.

There were also some cases where compound types were being declared
const-by-value instead of const-by-reference.
2022-09-12 09:32:19 -04:00
Kenneth Moreland
6560032241 Merge topic 'fix_doxygen_groups'
70ba476bd Fix doxygen groups

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2861
2022-09-09 08:23:46 -04:00
Mathieu Westphal
70ba476bd5 Fix doxygen groups 2022-09-09 10:37:31 +08:00
Dave Pugmire
b9074f0946 Merge topic 'zero_velocity_particle_advection_terminate'
74b85e08e Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into zero_velocity_particle_advection_terminate
29880d237 Move zero velocity to the integrator.
8aa56b7af Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into zero_velocity_particle_advection_terminate
c53110cca Fix numsteps test for file-based cases.
db5c71c19 Remove debugging line.
a5993a647 Terminate particles when it hits zero-velocity.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2839
2022-09-08 07:09:14 -04:00
Dave Pugmire
74b85e08e9 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into zero_velocity_particle_advection_terminate 2022-09-07 14:41:35 -04:00
Kenneth Moreland
fd8467ac95 Merge topic 'gitlab-sync-arg'
a911ec464 Fix example of gitlab-sync

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2859
2022-09-04 12:26:22 -04:00
Kenneth Moreland
a911ec464b Fix example of gitlab-sync
The example of using `git gitlab-sync` suggested giving the `-f`
argument, which is not supported by that command.
2022-09-02 14:50:24 -06:00
Zhe Wang
cc72fd1c7a Merge topic 'add_log_values_filter'
0374b957d add log values filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2852
2022-08-31 08:56:54 -04:00
Dave Pugmire
7740ba5bc1 Merge topic 'partitioned_dataset_fields'
0fb721207 Kick the dashboard builds.
30d1d86a0 Method was deprecated during the rename within the MR. (Not a new method).
a215ac320 Use {} initialization of FieldCollection.
4b60978a0 Simplify implementation of CreateResult.
98994026b Change GetPartitionField to GetFieldFromPartition.
fbe78b45c Change all usage of IsField* to Is*Field.
e395fe8fe Rename methods for consistency.
019d6cbc6 fix build error due to typo.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2853
2022-08-30 21:25:46 -04:00
Dave Pugmire
0fb721207f Kick the dashboard builds. 2022-08-30 16:24:01 -04:00
Dave Pugmire
30d1d86a04 Method was deprecated during the rename within the MR. (Not a new method). 2022-08-30 10:35:03 -04:00
Dave Pugmire
a215ac3202 Use {} initialization of FieldCollection. 2022-08-29 16:53:17 -04:00
Dave Pugmire
29880d2375 Move zero velocity to the integrator. 2022-08-29 16:03:55 -04:00
Dave Pugmire
8aa56b7aff Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into zero_velocity_particle_advection_terminate 2022-08-29 15:23:10 -04:00
Kenneth Moreland
4b60978a03 Simplify implementation of CreateResult. 2022-08-29 14:58:31 -04:00
Dave Pugmire
98994026bb Change GetPartitionField to GetFieldFromPartition. 2022-08-29 14:57:36 -04:00
Dave Pugmire
fbe78b45cf Change all usage of IsField* to Is*Field. 2022-08-29 14:42:02 -04:00
Kenneth Moreland
e395fe8fe8 Rename methods for consistency. 2022-08-29 14:01:23 -04:00
Dave Pugmire
019d6cbc6e fix build error due to typo. 2022-08-29 07:06:05 -04:00
Dave Pugmire
f69e598225 Change of Field::Association names. 2022-08-29 06:40:42 -04:00
Dave Pugmire
00b6657689 Address comments from Ken, Ollie. 2022-08-26 12:03:20 -04:00