Commit Graph

7705 Commits

Author SHA1 Message Date
Vicente Bolea
fcfeef0f42 Merge topic 'backport-cgohlke-master-patch-04055' into release-1.9
70728978d Fix unresolved external symbol __popcnt on win-arm64
df5b5bf32 Fix unresolved external symbol __popcnt on win-arm64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2932
2022-11-29 11:38:05 -05:00
Christoph Gohlke
70728978de Fix unresolved external symbol __popcnt on win-arm64
(cherry picked from commit 0575e036d9fc0ea2dabb1cba07d2bcd9a5b5f750)
2022-11-28 18:41:41 -05:00
Christoph Gohlke
df5b5bf321 Fix unresolved external symbol __popcnt on win-arm64
(cherry picked from commit 92a7bfc680a6d2cd62c6a40c628e72d77c5af26e)
2022-11-28 18:41:30 -05:00
Kenneth Moreland
74ed1c4cd0 Fix VTKM_LOG_SCOPE
The `VTKM_LOG_SCOPE` macro was not working as intended. It was supposed
to print a log message immediately and then print a second log message
when leaving the scope along with the number of seconds that elapsed
between the two messages.

This was not what was happening. The second log message was being
printed immediately after the first. This is because the scope was taken
inside of the `LogScope` method. The macro has been rewritten to put the
tracking in the right scope.
2022-11-10 07:12:19 -07:00
Ben Boeckel
b6e0391f28 Merge topic 'fix-clip-typelist' into release-1.9
42cb62028 Clip should use `VTKM_DEFAULT_TYPE_LIST` in CastAndCall

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2889
2022-10-13 14:08:56 -04:00
Sujin Philip
42cb620289 Clip should use VTKM_DEFAULT_TYPE_LIST in CastAndCall
This was causing an issue in VTK as the VTK specific typelist was not
being used. This resulted in a field's type being changed from `UInt8` to
`Float32` and caused a test to fail.
2022-10-13 12:14:45 -04:00
Kenneth Moreland
90c7e77075 Initialize DIY in vtkm::cont::Initialize
This has the side effect of initialing MPI_Init (and will also
call MPI_Finalize at program exit). However, if the calling
code has already called MPI_Init, then nothing will happen.
Thus, if the calling code wants to manage MPI_Init/Finalize,
it can do so as long as it does before it initializes VTK-m.
2022-10-07 14:54:33 -06:00
Kenneth Moreland
0df2344517 Merge topic 'contour-bug' into release-1.8
aaf49915e Fix Flying Edges z-boundary condition with non-square input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zhe Wang <godenwangzhe@gmail.com>
Merge-request: !2875
2022-09-29 13:37:12 -04:00
Kenneth Moreland
73dcbac213 Merge topic 'contour-bug' into release-1.9
aaf49915e Fix Flying Edges z-boundary condition with non-square input

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Zhe Wang <godenwangzhe@gmail.com>
Merge-request: !2875
2022-09-29 13:37:12 -04:00
Kenneth Moreland
aaf49915e0 Fix Flying Edges z-boundary condition with non-square input
There was a bug with Flying Edges checking the boundary conditions in
the z-direction. It was comparing the z index to the size of the y
dimension, not the z dimension. This simple typo was probably missed
because most of the tests use square meshes. To catch the problem, you
need a mesh that has a different number of points in the y and z
directions and the contour has to go past the positive z boundary.

When this error was hit, the indices for the edges on that boundary were
not recorded, and later interpolation used garbage values for edge's
point ids.
2022-09-29 06:25:12 -06: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
e2968ca244 Revised ComputeNumberOfBlocksPerAxis inspired by Ken Moreland's suggestion 2022-09-23 15:08:46 -07: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
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
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
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
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
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
Mathieu Westphal
70ba476bd5 Fix doxygen groups 2022-09-09 10:37:31 +08: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
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
Dave Pugmire
71c6f034d9 Use CreateResult mechanism for copying PDS fields. 2022-08-26 08:55:54 -04:00
Kenneth Moreland
9f7c60364e Add deprecated headers and classes for flow filters
When the flow filters were converted to the new filter base classes, the
classes and headers were moved to a new namespace. Support backward
compatibility by adding deprecated versions of headers.
2022-08-25 14:38:49 -06:00
Dave Pugmire
7d60c390ce Test PDS fields and filters. 2022-08-25 16:25:58 -04:00
Dave Pugmire
56e014f268 Do copy fields inside of NewFilter 2022-08-25 13:38:58 -04:00
Dave Pugmire
fa401ba016 Copy PDS fields in filter. Add more tests. 2022-08-25 09:28:35 -04:00
Dave Pugmire
75b9c398f0 Add new assocation, Partitions for a value per dataset. 2022-08-24 10:52:29 -04:00