Commit Graph

10756 Commits

Author SHA1 Message Date
Dave Pugmire
90586d36df Change default waveletdim back to 256. 2022-11-28 16:37:17 -05:00
Dave Pugmire
b7605689ac Add multiblock benchmarks for filters. 2022-11-28 16:35:28 -05:00
Dave Pugmire
4ca68d9c03 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2022-11-28 07:57:40 -05:00
Christoph Gohlke
0575e036d9 Fix unresolved external symbol __popcnt on win-arm64 2022-11-27 19:51:17 -05:00
Christoph Gohlke
92a7bfc680 Fix unresolved external symbol __popcnt on win-arm64 2022-11-27 19:46:13 -05:00
Dave Pugmire
163c974423 Merge topic 'cellLocatorUniformBins_3'
72a6e27b9 Update CMakeLists.txt
7d2d7fe1c Add a new unstructured cell locator
a7fcbf4a6 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
87c1bc782 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
6390b606b Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
eb0afdcea Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
f05166a39 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
b01629048 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2928
2022-11-23 07:39:00 -05:00
Dave Pugmire
72a6e27b99 Update CMakeLists.txt 2022-11-22 10:48:29 -05:00
Dave Pugmire
7d2d7fe1cc Add a new unstructured cell locator 2022-11-22 09:51:40 -05:00
Dave Pugmire
a7fcbf4a62 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2022-11-22 09:29:53 -05:00
Kenneth Moreland
2ddaa36858 Merge topic 'tube-cell-fields'
2bcc9aa70 Fix handling of cell fields in Tube filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2911
2022-11-21 16:43:03 -05:00
Dave Pugmire
87c1bc7824 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2022-11-21 08:51:46 -05:00
Kenneth Moreland
b47eb4999c Merge topic 'remove-deprecated'
3e1339f9a Remove deprecated features from VTK-m

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2925
2022-11-18 09:43:25 -05:00
Kenneth Moreland
3e1339f9a7 Remove deprecated features from VTK-m
With the major revision 2.0 of VTK-m, many items previously marked as
deprecated were removed. If updating to a new version of VTK-m, it is
recommended to first update to VTK-m 1.9, which will include the deprecated
features but provide warnings (with the right compiler) that will point to
the replacement code. Once the deprecations have been fixed, updating to
2.0 should be smoother.
2022-11-17 07:12:31 -06:00
Kenneth Moreland
03173eced7 Merge topic 'coords-are-fields'
4ca64f0f0 Back out of DataSet::CopyPartsFromExcept method
2d30e6d45 Coordinate systems are stored as Fields

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2920
2022-11-17 08:10:15 -05:00
Kenneth Moreland
4ca64f0f09 Back out of DataSet::CopyPartsFromExcept method
This method is too unwieldy. Instead go back to `CopyStructure` and
other direct copy methods.
2022-11-11 07:53:20 -07:00
Kenneth Moreland
2d30e6d45a Coordinate systems are stored as Fields
Previously, `DataSet` managed `CoordinateSystem`s separately from `Field`s.
However, a `CoordinateSystem` is really just a `Field` with some special
attributes. Thus, coordiante systems are now just listed along with the
rest of the fields, and the coordinate systems are simply strings that
point back to the appropriate field. (This was actually the original
concept for `DataSet`, but the coordinate systems were separated from
fields for some now obsolete reasons.)
2022-11-11 06:17:58 -07:00
Kenneth Moreland
dbc2364e35 Merge topic 'ghost-cell-api'
a58c2cdac Change how cell ghost levels are set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2924
2022-11-11 08:00:29 -05:00
Dave Pugmire
6390b606b7 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2022-11-10 16:31:52 -05:00
Kenneth Moreland
44a976f905 Merge topic 'zfp-output-fields'
478f765db Attach compressed ZFP data as WholeDatSet field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2910
2022-11-10 12:41:55 -05:00
Kenneth Moreland
9932d07d6d Merge topic 'fix-log-scope' into release-1.9
74ed1c4cd Fix VTKM_LOG_SCOPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2923
2022-11-10 12:18:41 -05:00
Kenneth Moreland
5cb8598199 Merge branch 'release-1.9' 2022-11-10 12:18:41 -05:00
Kenneth Moreland
bd0a59a3fd Merge topic 'fix-log-scope'
74ed1c4cd Fix VTKM_LOG_SCOPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2923
2022-11-10 12:18:41 -05:00
Kenneth Moreland
478f765db2 Attach compressed ZFP data as WholeDatSet field
Previously, point fields compressed by ZFP were attached as point fields
on the output. However, using them as a point field would cause
problems. So, instead attache them as `WholeDataSet` fields.

Also fixed a problem where the 1D decompressor created an output of the
wrong size.
2022-11-10 08:18:11 -07: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
Vicente Bolea
8bd0ba89c9 Merge topic 'smoke_test_fix'
36e47c9e6 CI: force smoke test to use dev adapter compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2915
2022-11-09 12:11:27 -05:00
Kenneth Moreland
a58c2cdacf Change how cell ghost levels are set
The name of the methods were changed from `AddGhostCellField` to
`SetGhostCellField` since only one field can be marked as the cell
ghost. Also automatically select a field that matches
`GetGlobalCellFieldName` if nothing else is set.
2022-11-09 08:40:37 -07:00
Vicente Adolfo Bolea Sanchez
36e47c9e65 CI: force smoke test to use dev adapter compiler 2022-11-08 14:31:07 -05:00
Kenneth Moreland
8493dbd60f Merge topic 'no-virtual-ci-settings'
9e32b1c8d Remove no_virtual option from ci settings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !2922
2022-11-07 13:10:04 -05:00
Kenneth Moreland
9e32b1c8d7 Remove no_virtual option from ci settings
The `no_virtual` setting is no longer supported (because virtual methods
are completely removed from VTK-m), so the setting did nothing. Thus, we
can remove that option from the settings in CI.
2022-11-07 09:13:26 -07:00
Tushar Athawale
10a30b8497 Merge topic 'GetDefaultField_GhostCellRemove'
09de1c886 Unit test update for default and user-specified ghost field
7414e02b6 added flag for SetGhostCellAsField function
72f8bb9cc Check if default ghost cell field is requested for use
63e7b2336 Set and Get methods for UseGhostCellsAsField
fc44a6100 Added a flag UseGhostCellsAsField for default use

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2840
2022-11-07 10:17:54 -05:00
Dave Pugmire
eb0afdcea0 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m 2022-11-07 07:54:58 -05:00
Tushar Athawale
09de1c8863 Unit test update for default and user-specified ghost field 2022-11-04 17:52:10 -04:00
Tushar Athawale
7414e02b62 added flag for SetGhostCellAsField function 2022-11-04 17:52:10 -04:00
Tushar Athawale
72f8bb9cce Check if default ghost cell field is requested for use 2022-11-04 17:52:10 -04:00
Tushar Athawale
63e7b2336a Set and Get methods for UseGhostCellsAsField 2022-11-04 17:52:10 -04:00
Tushar Athawale
fc44a61001 Added a flag UseGhostCellsAsField for default use 2022-11-04 17:52:10 -04:00
Kenneth Moreland
d81d2ebabc Merge topic 'include-and-exclude-field-selection'
f3fa4f127 Allow FieldSelection to simultaneously include and exclude fields

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2919
2022-11-04 08:20:25 -04:00
Kenneth Moreland
f3fa4f127a Allow FieldSelection to simultaneously include and exclude fields
The basic use of `FieldSelection` is to construct the class with a mode
(`None`, `Any`, `Select`, `Exclude`), and then specify particular fields
based off of this mode. This works fine for basic uses where the same code
that constructs a `FieldSelection` sets all the fields.

But what happens, for example, if you have code that takes an existing
`FieldSelection` and wants to exclude the field named `foo`? If the
`FieldSelection` mode happens to be anything other than `Exclude`, the code
would have to go through several hoops to construct a new `FieldSelection`
object with this modified selection.

To make this case easier, `FieldSelection` now has the ability to specify
the mode independently for each field. The `AddField` method now has an
optional mode argument the specifies whether the mode for that field should
be `Select` or `Exclude`.

In the example above, the code can simply add the `foo` field with the
`Exclude` mode. Regardless of whatever state the `FieldSelection` was in
before, it will now report the `foo` field as not selected.
2022-11-03 12:57:59 -06:00
Vicente Bolea
95eb30327f Merge topic 'ascent-paralelism'
9a891cad6 CI: restore build parallelism level

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2918
2022-11-03 13:24:41 -04:00
Vicente Bolea
8738d79b4a Merge topic 'windows-fix'
742bd1d12 CI: windows build clean build processes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2908
2022-11-02 17:03:36 -04:00
Vicente Adolfo Bolea Sanchez
9a891cad61 CI: restore build parallelism level 2022-11-02 15:59:15 -04:00
Vicente Adolfo Bolea Sanchez
742bd1d12d CI: windows build clean build processes 2022-11-02 19:32:46 +00:00
Kenneth Moreland
6db2a8ea37 Merge topic 'cont-portal-token'
54f0ef2a8 Support providing a Token to ReadPortal and WritePortal

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2916
2022-11-02 13:06:59 -04:00
Vicente Bolea
10b3714b0a Merge topic 'fix-ascent-build'
625522586 CI: Generate a tmp commit for Ascent build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <morelandkd@ornl.gov>
Merge-request: !2917
2022-11-02 11:37:12 -04:00
Kenneth Moreland
e57d511823 Merge topic 'field-length-checking'
63702d5d1 Check to make sure that the fields in a DataSet are the proper length

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2914
2022-11-02 08:54:04 -04:00
Kenneth Moreland
e3f74cb482 Merge topic 'splitsharpedges-point-count'
aa5687512 Correct the number of points in `SplitSharpEdges` filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Abhishek Yenpure <abhi.yenpure@kitware.com>
Merge-request: !2912
2022-11-02 08:50:03 -04:00
Kenneth Moreland
de7fd6cd61 Merge topic 'particle-density-output-field'
74a8d688e Correct particle density filter output field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Li-Ta Lo <ollie@lanl.gov>
Merge-request: !2913
2022-11-02 08:45:21 -04:00
Vicente Adolfo Bolea Sanchez
6255225863 CI: Generate a tmp commit for Ascent build
- Print out the ECP Pipeline url.
2022-11-01 18:03:03 -04:00
Kenneth Moreland
63702d5d13 Check to make sure that the fields in a DataSet are the proper length
It is possible in a `DataSet` to add a point field (or coordinate system)
that has a different number of points than reported in the cell set.
Likewise for the number of cells in cell fields. This is very bad practice
because it is likely to lead to crashes in worklets that are expecting
arrays of an appropriate length.

Although `DataSet` will still allow this, a warning will be added to the
VTK-m logging to alert users of the inconsistency introduced into the
`DataSet`. Since warnings are by default printed to standard error, users
are likely to see it.
2022-11-01 12:05:59 -06:00
Kenneth Moreland
27b27bde8e Merge topic 'expose-variant'
c029ac113 Expose the Variant helper class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2907
2022-11-01 13:50:32 -04:00