Commit Graph

2997 Commits

Author SHA1 Message Date
David C. Lonie
fd0e3e0e3e Remove vtable from WaveletFilter.
This header-only class had a virtual destructor, but no other virtual
methods or subclasses.
2017-04-13 14:08:27 -04:00
David C. Lonie
96bf0dac1b Give AxisAnnotation a virtual destructor.
This is necessary since the class has virtual methods, and also
instructs the compiler that the class's vtable is to be stored in the
vtk_rendering library.
2017-04-13 14:07:41 -04:00
David C. Lonie
4807b3c472 Silence warnings about unavoidable weak vtables.
- Exception classes cannot be exported due to MSVC's design decisions.
  See http://stackoverflow.com/questions/24511376. We must leave these
  classes as header only and silence the warnings.
- TransferResource in BufferState.h must remain a header-only class since
  there is no vtkm_interop library to compile the class into.
- The VTKDataSetReader hierarchy must similarly remain header-only since
  there is no vtkm_io library.
- The OptionParser Action classes are part of a header-only utility and
  cannot be easily compiled into a library.
-
2017-04-13 14:06:33 -04:00
Robert Maynard
451930f03a Merge topic 'adjust_tbb_grain_size'
5f55be17 Update the TBB grain size to be a more reasonable default.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !740
2017-04-07 12:27:01 -04:00
Robert Maynard
5f55be17e7 Update the TBB grain size to be a more reasonable default.
We not only update the TBB grain size to be a more value, we also specify
a grain size for the 3D scheduler.
2017-04-06 16:34:15 -04:00
Patricia Fasel
efc21fb6a0 Merge topic 'extract-subset'
5b651172 Merge branch 'master' into extract-subset
6ac23147 Add unit test for Box ImplicitFunction
8190187d Error on empty constructor ExtractGeometryByVOI
836e9472 VTKM_EXEC on operator caused CUDA synchronization error
f3b4b29e Use float not double for defining ImplicitFunctions
c7e03050 Warnings
be977850 Change subset extraction on points to use WorkletMapCellToPoint
11e0a252 Floating point warnings
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !736
2017-03-31 13:56:45 -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
6ac2314796 Add unit test for Box ImplicitFunction 2017-03-30 16:31:38 -06:00
Patricia Kroll Fasel - 090207
8190187d7d Error on empty constructor ExtractGeometryByVOI 2017-03-30 12:23:00 -06:00
Patricia Kroll Fasel - 090207
836e947200 VTKM_EXEC on operator caused CUDA synchronization error 2017-03-30 11:22:07 -06:00
Patricia Kroll Fasel - 090207
f3b4b29e40 Use float not double for defining ImplicitFunctions 2017-03-29 16:24:42 -06:00
Patricia Kroll Fasel - 090207
c7e0305097 Warnings 2017-03-29 15:13:34 -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
16c211816c Add in Mask.h worklet and test 2017-03-28 14:42:22 -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
9e90b31a0a Merge branch 'tri-tet-fix' of gitlab.kitware.com:Fasel/vtk-m into tri-tet-fix 2017-03-28 09:44:15 -06:00
Patricia Kroll Fasel - 090207
7c64785f3c Fix warnings and add to tetrahedralize unit test 2017-03-28 09:43:32 -06:00
Li-Ta Lo
7f4d5de2b2 remove unused code in CMakeList.txt 2017-03-28 09:05:08 -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
Li-Ta Lo
fb8a8369ca update examples/tetrhedra to use filters instead of worklets 2017-03-27 17:38:03 -06:00
Li-Ta Lo
8d5ce89458 Merge branch 'tri-tet-fix' of gitlab.kitware.com:Fasel/vtk-m into tri-tet-fix 2017-03-27 16:47:44 -06:00
Patricia Kroll Fasel - 090207
9dcfbf368f Throw error bad type on structured 2017-03-27 16:25:38 -06:00
Patricia Kroll Fasel - 090207
5ff1d2b1a0 Use CastAndCall on DynamicCellSet in filters 2017-03-27 16:09:18 -06:00
Li-Ta Lo
ee4c319003 fixed compiler errors 2017-03-27 14:59:44 -06:00
Kenneth Moreland
f4f56798c2 Merge topic 'input-range-to-transport'
0b12cab1 Fix overshadowing of class member with template parameter
d68b2113 Remove TransportTagReducedValuesIn
dc192b79 Add input range to arguments of transport

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !734
2017-03-27 13:43:01 -04: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 Fasel
49d897ef9f Merge topic 'triangle-tetra-filter'
36b48099 Move the processing of scatter cell data to worklet from the filter.
3a1a6aec Added mapping of cell data onto output dataset
984af5a2 Reorganize Triangulate and Tetrahedralize and write filters.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !732
2017-03-27 10:27:17 -04: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
Kenneth Moreland
0b12cab1dd Fix overshadowing of class member with template parameter 2017-03-24 15:36:58 -06:00
Kenneth Moreland
d68b211346 Remove TransportTagReducedValuesIn
Now that the transport takes the input range as one of its arguments,
this functionality can be implemented by the more general
TransportTagArrayIn.
2017-03-24 15:32:27 -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
Kenneth Moreland
dc192b793d Add input range to arguments of transport
Previously the arguments to the operator of a vtkm::cont::arg::Transport
were the control object, the input domain object, and the output range.
If you wanted to, for example, check the size of an input array to make
sure it matched the input range, you would have to know the meaning of
the input domain object to query its range. This made it hard to create
generic transports, like TransportTagArrayIn, that accept data from
multiple different input domains but need to know the input range.
2017-03-24 15:14:18 -06: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
Patricia Kroll Fasel - 090207
54171e1d87 Third version of ExtractGeometry which finally looks more like
Threshold.  CellSetSingleType returned for extract points and
CellSetPermutation returned for extract cells.
2017-03-20 14:40:53 -06:00
Patricia Kroll Fasel - 090207
d1e8de3efe Add ExtractCellSetStructured by id, by implicit function, 2D, 3D 2017-03-17 17:00:59 -06:00
Robert Maynard
2481dd6248 Merge topic 'multi_iso_value_contour'
5566afdd Allow MarchingCubes to handle multiple iso-contour values.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !730
2017-03-17 14:16:17 -04:00
Patricia Kroll Fasel - 090207
ad66b2be33 Add extraction subdirectory. ExtractGeometry entry point for point and
cell extraction.
2017-03-16 14:53:16 -06:00
Patricia Kroll Fasel - 090207
9583e627dc Add ExtractCells by Id and by ImplicitFunction 2017-03-16 13:44:01 -06:00
Li-Ta Lo
5a50d60573 Merge topic 'unified-memory'
2bdc0be5 add cuda calls for memory advise as per Tom Fogel
6ce8a013 Merge branch 'master' into unified-memory
b470175f new unified memory effort with the new Thrust device
835073da clean up with custom allocator
dfae8f5e Fixing merge issue with contour_tree
82c40a63 First support for unified memory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !729
2017-03-16 15:14:55 -04:00
Robert Maynard
5566afdd8d Allow MarchingCubes to handle multiple iso-contour values. 2017-03-16 11:49:20 -04:00
Li-Ta Lo
2bdc0be5ca add cuda calls for memory advise as per Tom Fogel 2017-03-14 14:19:01 -06:00
Patricia Kroll Fasel - 090207
8598711c09 ExtractPoints worklet for ImplicitFunction
Add Box to ImplicitFunction
2017-03-14 12:14:50 -06:00
Sujin Philip
ed1f568d2d Merge topic 'fix-readers-fields-parsing'
07cb1119 Fix more issues with the readers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !726
2017-03-14 11:42:29 -04:00