Commit Graph

125 Commits

Author SHA1 Message Date
Sujin Philip
4049b5b25e Add ClipWithImplicitFunction Filter
Rename current Clip filter to ClipWithField.
2017-05-01 16:56:54 -04:00
Patricia Kroll Fasel - 090207
5b651172cf Merge branch 'master' into extract-subset 2017-03-30 16:34:50 -06:00
Patricia Kroll Fasel - 090207
be97785036 Change subset extraction on points to use WorkletMapCellToPoint 2017-03-29 14:04:58 -06:00
Patricia Fasel
d9234e39c7 Merge topic 'tri-tet-fix'
9e90b31a Merge branch 'tri-tet-fix' of gitlab.kitware.com:Fasel/vtk-m into tri-tet-fix
7c64785f Fix warnings and add to tetrahedralize unit test
7f4d5de2 remove unused code in CMakeList.txt
fb8a8369 update examples/tetrhedra to use filters instead of worklets
8d5ce894 Merge branch 'tri-tet-fix' of gitlab.kitware.com:Fasel/vtk-m into tri-tet-fix
9dcfbf36 Throw error bad type on structured
5ff1d2b1 Use CastAndCall on DynamicCellSet in filters
ee4c3190 fixed compiler errors
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !735
2017-03-29 10:38:18 -04:00
Patricia Kroll Fasel - 090207
11e0a252d9 Floating point warnings 2017-03-28 16:07:56 -06:00
Patricia Kroll Fasel - 090207
84a9254868 Extract using ImplicitFunction for VOI removed from filters 2017-03-28 14:15:15 -06:00
Patricia Kroll Fasel - 090207
7c64785f3c Fix warnings and add to tetrahedralize unit test 2017-03-28 09:43:32 -06:00
Robert Maynard
1d84a8dbf4 Merge topic 'refactor_marching_cubes'
b4d542e3 MarchingCubes now merges points correctly when it has multiple iso contours

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !733
2017-03-28 09:45:56 -04:00
Patricia Kroll Fasel - 090207
5ff1d2b1a0 Use CastAndCall on DynamicCellSet in filters 2017-03-27 16:09:18 -06:00
Patricia Kroll Fasel - 090207
6f49c50dd1 Attempt partial specialization of Run() in worklets 2017-03-27 11:41:37 -06:00
Patricia Kroll Fasel - 090207
9f06a1ea37 Merge branch 'master' into extract-subset 2017-03-27 08:58:17 -06:00
Patricia Kroll Fasel - 090207
36b480993d Move the processing of scatter cell data to worklet from the filter. 2017-03-24 16:34:53 -06:00
Robert Maynard
b4d542e345 MarchingCubes now merges points correctly when it has multiple iso contours
The previous version of point merging incorrectly merged points across
multiple iso contours, this version fixes that issue.

The marching cubes had a fairly complex block of logic for point merging
since it had to handle numerous runtime switches. This refactor this
logic so it is easier to follow.
2017-03-24 17:28:06 -04:00
Patricia Kroll Fasel - 090207
3a1a6aece3 Added mapping of cell data onto output dataset 2017-03-23 17:14:39 -06:00
Patricia Kroll Fasel - 090207
984af5a2b4 Reorganize Triangulate and Tetrahedralize and write filters. 2017-03-23 11:58:00 -06:00
Patricia Kroll Fasel - 090207
6cb3f9165d Merge branch 'master' into extract-subset 2017-03-22 11:18:34 -06:00
Patricia Kroll Fasel - 090207
9effab0063 Add Mask filter and tests. 2017-03-21 16:11:06 -06:00
Patricia Kroll Fasel - 090207
9f0c99920c Add filters and tests for ExtractPoints and ExtractGeometry, by id only. 2017-03-21 15:14:35 -06:00
Robert Maynard
5566afdd8d Allow MarchingCubes to handle multiple iso-contour values. 2017-03-16 11:49:20 -04:00
Kenneth Moreland
6fdc7eb8c0 Add Field::GetRange and CoordinateSystem::GetBounds to library
Following what was done with ArrayRangeCompute, the GetRange and
GetBounds methods are embedded into the vtkm_cont library for the most
common type lists.

Also, and probably more importantly, the device adapter is no longer one
of the arguments for either of these methods. It is no longer needed as
ArrayRangeCompute no longer needs it.
2017-03-09 13:18:36 -05:00
Patricia Kroll Fasel - 090207
be73dec0cb Default for selected points changed to CompactPoints = true 2017-03-09 09:16:41 -07:00
Patricia Kroll Fasel - 090207
fa0b9bee73 MaskPoints worklet and filter added 2017-03-08 16:04:12 -07:00
Patricia Kroll Fasel - 090207
c1b2d1f50a Add filter and unit test to ThresholdPoints.
Allow for CompactPoints to call CleanGrid.
2017-03-08 13:25:27 -07:00
Patricia Kroll Fasel - 090207
040b0420ab Merge branch 'master' into extract-subset 2017-03-07 14:06:23 -07:00
Patricia Kroll Fasel - 090207
dee28a3089 ThresholdPoints first attempt 2017-03-07 14:03:22 -07:00
Sujin Philip
1ceb46f802 Merge topic 'externalfaces-cleangrid'
e2efb839 External Faces filter add CompactPoints option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !720
2017-03-07 13:59:23 -05:00
Sujin Philip
e2efb839a7 External Faces filter add CompactPoints option 2017-03-07 11:05:52 -05:00
Sujin Philip
9eddce6c99 Rename StreamCompact to CopyIf
Plus, removes the version that uses one array as both input and stencil.
2017-03-06 11:08:27 -05:00
Sujin Philip
269691e7ff Map point fields in ExternalFaces filter 2017-03-03 15:43:52 -05:00
Sujin Philip
f1bc19f4a2 Merge topic 'improve-ExternalFaces-filter'
b1d6e743 Improve ExternalFaces filter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !714
2017-03-03 08:33:30 -05:00
Sujin Philip
b1d6e74353 Improve ExternalFaces filter
Now it can work with more types of input CellSets.
2017-03-02 16:31:01 -05:00
David C. Lonie
8d5f4eb690 Expose the normal array's name in the MarchingCubes filter. 2017-03-02 12:15:20 -05:00
Sujin Philip
57f5881538 Merge topic 'use-c++11=delete'
8c4bbc39 Use C++11 =delete keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !708
2017-02-24 13:31:57 -05:00
Kenneth Moreland
3e77f4e18b Merge topic 'refactor-runtime-device-tracker'
18c4190d Update classes using RuntimeDeviceTracker
200928ef Add a global RuntimeDeviceTracker
a3573117 Compile RuntimeDeviceTracker.cxx with CUDA when appropriate
814b2db1 Add the implementation of RuntimeDeviceTracker to cont library
b9d3206e Move RuntimeDeviceTracker to vtkm::cont

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !707
2017-02-24 10:50:19 -05:00
Sujin Philip
8c4bbc39ad Use C++11 =delete keyword 2017-02-24 09:39:22 -05:00
Sujin Philip
e5bc34e9f5 Merge topic 'catch-by-reference'
a88807fd Catch all exceptions by reference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !704
2017-02-23 16:36:00 -05:00
Sujin Philip
a88807fd7e Catch all exceptions by reference 2017-02-23 13:25:01 -05:00
David C. Lonie
14f216d58e Update the output coordinates for the clip filter.
The clip worklet will change the number of points in the result
set by adding points at the clip boundaries. The filter was updating
the clipped scalar array to reflect the new points, but not the actual
coordinate array.

This patch will cause the clip filter's result dataset to contain the
correct number of points and no longer automatically map the scalar
array onto the output, since this is easily done via the filter API.
2017-02-23 12:41:40 -05:00
Kenneth Moreland
18c4190d85 Update classes using RuntimeDeviceTracker
They now grab the global runtime device tracker. In some cases, I've
added the ability to set/get the tracker to change it from the global.
In others I just removed the local copy, since it was just hooked into
the global tracker.
2017-02-23 09:54:41 -07:00
Kenneth Moreland
b9d3206ea6 Move RuntimeDeviceTracker to vtkm::cont
Before it was in the vtkm::cont::internal namespace. However, we expect
to be using this feature quite a bit more as we want VTK-m to handle
multiple devices effectively (as in, just figure it out and go).
2017-02-22 13:33:52 -07:00
David C. Lonie
ab9e1f6e9d Ignore filter traits when mapping fields to output.
The input type restrictions in FilterTraits should not be used to
restrict the arrays that can be mapped to the output dataset.
2017-02-22 14:30:56 -05:00
Kenneth Moreland
d339025a1b Merge topic 'external-face-more-generic'
dcbbb727 Merge branch 'master' into external-face-more-generic
0703139a Make Keys class do in-place sort
059c7f6d Fix issue with ExternalFaces on CellSetSingleType
876514ba Add better test for external faces
53679dfc Update ExternalFaces to support mixed face types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brent Lessley <blessley@cs.uoregon.edu>
Merge-request: !662
2017-02-16 10:28:56 -05:00
Thomas Otahal
9d9c39e197 Merge topic 'vector_magnitude_field_filter'
ba2be2fe Added FilterTraits and code cleanup.
f6d5d24c Removed integer vector field from vector magnitude filter unit test
70e145fd Attempt to fix Visual Studio 2013/2015 warning message
f1300c61 Changed vtkm::Abs() to return input type
71b2348d Adjusted Math.h.in for const vtkm::Float32 function inputs
7d6601d7 Modified Math.h.in and VectorAnalysis.h to support integral types.
cd95cbe9 Modified Math.h.in instead of Math.h
5777c4ca Merge branch 'master' into vector_magnitude_field_filter
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !666
2017-02-10 11:34:28 -05:00
Thomas J. Otahal
ba2be2fe3a Added FilterTraits and code cleanup. 2017-02-09 10:58:49 -07:00
Kenneth Moreland
dcbbb72784 Merge branch 'master' into external-face-more-generic
Update exception methods to new names.
2017-02-08 17:10:17 -07:00
David C. Lonie
f601e38ba8 Simplify exception hierarchy.
Remove the ErrorControl class such that all subclasses now inherit from
error. Renamed all exception classes via s/ErrorControl/Error/.

See issue #57.
2017-02-07 15:42:38 -05:00
Thomas J. Otahal
f6d5d24c82 Removed integer vector field from vector magnitude filter unit test
Integer vector field was causing link errors on Windows with Visual
Studio.
2017-02-07 11:38:52 -07:00
Kenneth Moreland
059c7f6db0 Fix issue with ExternalFaces on CellSetSingleType
The ExternalFaces filter should work fine on a CellSetSingleType.
However, the filter was not operating on them because it a templated
method that is a placeholder for "this cell set type not supported" was
matching it. This simple change allows a CellSetSingleType to match the
template for a CellSetExplicit (which is the superclass).
2017-01-26 13:35:51 -07:00
Kenneth Moreland
53679dfc9c Update ExternalFaces to support mixed face types
Previously, ExternalFaces really only supported tetrahedral meshes that
have only triangular faces. These changes support all mixes of cells and
their faces.
2017-01-26 13:35:46 -07:00
Thomas J. Otahal
7d6601d794 Modified Math.h.in and VectorAnalysis.h to support integral types.
Unary operations on scalars and vectors will return vtkm::Float64 for
integral input types and vtkm::Float64 input types. Unary operations will
return vtkm::Float32 for vtkm::Float32 input vectors and scalars.
2017-01-26 13:30:28 -07:00