Commit Graph

80 Commits

Author SHA1 Message Date
David C. Lonie
63aecfa501 Refactor field processing for Mask worklet/filter. 2017-06-15 13:17:52 -04:00
Sujin Philip
75f0957f8c Merge topic 'add-SmoothSurfaceNormals'
18d0f3e1 Add SmoothSurfaceNormals worklet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !798
2017-06-12 17:21:45 -04:00
Sujin Philip
18d0f3e143 Add SmoothSurfaceNormals worklet
Also updates SurfaceNormals filter to produce smooth normals.
2017-06-12 16:50:22 -04:00
Sujin Philip
6ce2a43d41 Simplify ArrayHandleTransform template 2017-06-08 16:46:45 -04:00
Sujin Philip
749c0c8920 Add Worklet and Filter for faceted surface normals 2017-06-08 09:37:12 -04:00
Sujin Philip
3ecac66cf7 Merge topic 'update-extract-structured'
fbabd582 Simplify ExtractStructured implementation
d6187283 Add vtkm::RangeId and vtkm::RangeId3
7ee57a82 Mark CellSetStructured functions as const

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !787
2017-06-02 10:07:45 -04:00
Sujin Philip
fbabd58222 Simplify ExtractStructured implementation 2017-05-30 17:07:14 -04:00
caseywang777
3b0081b592 Merge branch 'master' of gitlab.kitware.com:vtk/vtk-m 2017-05-30 10:39:46 -06:00
Robert Maynard
5dd346007b Respect VTK-m convention of parameters all or nothing on a line
clang-format BinPack settings have been disabled to make sure that the
VTK-m style guideline is obeyed.
2017-05-26 13:53:28 -04:00
Kitware Robot
4ade5f5770 clang-format: apply to the entire tree 2017-05-25 07:51:37 -04:00
caseywang777
b9405680d7 Merge remote-tracking branch 'vtkmUpstream/master' 2017-05-24 12:32:31 -06:00
caseywang777
a9e05698c6 add new line at the end of UnitTestEntropyFilter.cxx 2017-05-23 12:04:54 -06:00
caseywang777
f295251d7e resolve the issue from the code review 2017-05-23 11:59:19 -06:00
caseywang777
7391d516b4 Add UnitTest for EntropyFilter 2017-05-23 10:44:02 -06:00
Kitware Robot
efbde1d54b clang-format: sort include directives 2017-05-18 12:59:33 -04:00
Patricia Kroll Fasel - 090207
d80e64385a Add ExtractGeometry filter and unit test 2017-05-04 13:13:53 -06:00
Patricia Kroll Fasel - 090207
9106f6b4b7 Add ExtractPoints filter which only does ImplicitFunction extraction 2017-05-03 15:07:06 -06:00
Patricia Fasel
5a4c029719 Merge topic 'extract-structured'
6a88cde5 Remove unnecessary const parameters
0e3a98f8 Add subsample and include boundary
14066d86 Add filter for ExtractStructured
e4283344 Clean up
78148b02 Rectilinear with subset and sample and tests
49f86625 Uniform subset and sample worklet and unit tests working
d7a53792 Use vtkm:Bounds for all bounding boxes
0975e189 Introduce subsampling parameter
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !744
2017-05-03 10:21:14 -04:00
Sujin Philip
4049b5b25e Add ClipWithImplicitFunction Filter
Rename current Clip filter to ClipWithField.
2017-05-01 16:56:54 -04:00
Patricia Kroll Fasel - 090207
0e3a98f827 Add subsample and include boundary 2017-04-27 14:53:51 -06:00
Patricia Kroll Fasel - 090207
14066d8692 Add filter for ExtractStructured 2017-04-18 08:32:13 -06:00
Patricia Kroll Fasel - 090207
5b651172cf Merge branch 'master' into extract-subset 2017-03-30 16:34:50 -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
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
9f06a1ea37 Merge branch 'master' into extract-subset 2017-03-27 08:58:17 -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
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
e2efb839a7 External Faces filter add CompactPoints option 2017-03-07 11:05:52 -05:00
Sujin Philip
269691e7ff Map point fields in ExternalFaces filter 2017-03-03 15:43:52 -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
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
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
Thomas J. Otahal
5777c4caa5 Merge branch 'master' into vector_magnitude_field_filter
Conflicts:
	vtkm/worklet/testing/CMakeLists.txt
2017-01-24 09:55:31 -07:00
Robert Maynard
2c916780a0 Reduce the amount of output the UnitTestHistogramFilter generates
It was producing about 40MB of output when saved by cdash/buildbot so
lets reduce that and make web pages load again.
2017-01-24 09:21:43 -05:00
Kenneth Moreland
5004e64c3e Fix CleanGrid when compact point fields is off
There was an error in the CleanGrid filter where if the
CompactPointFields flag was off it would still try to compact the point
coordinates. Add an extra check so that the coordinate systems are just
passed when this flag is off.
2017-01-19 14:10:40 -07:00
Thomas J. Otahal
556b922733 Created a filter for the vector magnitude worklet.
Modified the vector magnitude worklet to accept VecAll instead
of Vec3 and return Scalar. Modified the Magnitude() and Sqrt() functions
to return FloatDefault for all inputs except for Float64.

Perhaps we should modify other functions in Math.h and VectorAnalysis.h to
return float types for intergral arguments instead of integral types?
2017-01-19 13:27:42 -07:00
Robert Maynard
4a56e9f129 Merge branch 'contour-tree' into 'master'
Contour tree

See merge request !658
2017-01-17 17:00:54 -05:00
Kenneth Moreland
713cf4228a Make it not possible to create a cell set without specifying num points
The CellSetExplicit and CellSetSingleType classes have an ivar that
marks the number of points. There were several instances of code
creating cell sets without specifying the number of points. This can be
very bad if subsequent code needs that information.
2017-01-12 13:02:10 -07:00