Commit Graph

1174 Commits

Author SHA1 Message Date
Robert Maynard
1b3b4d0607 Merge topic 'cellset_single_type_correct_fill'
95f0ed50 CellSetSingleType::Fill now works with custom storage types.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !239
2015-10-14 11:34:38 -04:00
Robert Maynard
95f0ed5016 CellSetSingleType::Fill now works with custom storage types. 2015-10-14 11:03:24 -04:00
Robert Maynard
2ef9ef4dd9 Merge topic 'clip_test_works_with_64bit_default_float'
c78aac46 UnitTestClipping now properly handles 64bit vtkm::FloatDefault.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !238
2015-10-13 11:24:04 -04:00
Robert Maynard
c78aac4650 UnitTestClipping now properly handles 64bit vtkm::FloatDefault. 2015-10-13 10:29:46 -04:00
Robert Maynard
7361e67abe Merge topic 'icc_copy_backwards'
9006b974 Manually do copy_backwards since ICC was replacing it with copy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !237
2015-10-12 16:14:48 -04:00
Robert Maynard
9006b97432 Manually do copy_backwards since ICC was replacing it with copy
When ICC replaced copy_backwards with copy it causes a failure when the
input and output arrays are the same.
2015-10-12 15:19:54 -04:00
T.J. Corona
f3eb2fbd23 Merge topic 'cuda-array-handle'
b1665dcb Add an array handle for bare cuda device pointers.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !216
2015-10-09 14:57:00 -04:00
T.J. Corona
b1665dcb32 Add an array handle for bare cuda device pointers.
Array handles for cuda device pointers have been implemented. The data for
these handles exists solely on the exec side (info such as length can be
queried from the cont side).
2015-10-09 12:41:33 -04:00
Patricia
fff5c391c0 Merge topic 'tetra_explicit'
65c9de08 Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_explicit
c94dca79 Compiler warnings
2b43e525 Compiler warnings
cba29a1e Fix compiler warnings
cbbd7e6e Initialize variable used in if test.
0b9cffe4 Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_explicit
5a7b3668 Correct for gcc and pgi compilers and CastTo.  Add CellSetSingleType for output.
c87b4f50 Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_explicit
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !217
2015-10-08 18:31:14 -04:00
Patricia Kroll Fasel - 090207
65c9de08bd Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_explicit 2015-10-08 16:07:18 -06:00
Patricia
610672a3a1 Merge topic 'tetra_uniform'
5f6a552a Compiler warnings
b7473712 Compiler warnings GL deprecated
2f532bf3 Compiler warnings
5569d8c1 Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_uniform
0e8b9b15 Compiler warnings.
810e6b00 Fix CastTo with template to avoid compiler errors.
deceb79e Fix to work with gcc and pgi compilers.  Change to use CellSetSingleType.
f624683e Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_uniform
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !204
2015-10-08 17:36:47 -04:00
Sujin Philip
8898e81a7f Merge topic 'clip-with-implicit-functions'
15ad5958 Add support for clipping with implicit functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !235
2015-10-08 16:12:28 -04:00
Patricia Kroll Fasel - 090207
5f6a552a26 Compiler warnings 2015-10-08 12:12:49 -06:00
Patricia Kroll Fasel - 090207
c94dca791b Compiler warnings 2015-10-08 12:07:13 -06:00
Patricia Kroll Fasel - 090207
b74737125c Compiler warnings GL deprecated 2015-10-08 11:45:50 -06:00
Patricia Kroll Fasel - 090207
2b43e52516 Compiler warnings 2015-10-08 11:38:56 -06:00
Patricia Kroll Fasel - 090207
2f532bf379 Compiler warnings 2015-10-08 11:11:08 -06:00
Patricia Kroll Fasel - 090207
cba29a1e67 Fix compiler warnings 2015-10-08 10:52:34 -06:00
Patricia Kroll Fasel - 090207
cbbd7e6edd Initialize variable used in if test. 2015-10-08 10:18:05 -06:00
Sujin Philip
15ad595888 Add support for clipping with implicit functions 2015-10-08 12:12:51 -04:00
Patricia Kroll Fasel - 090207
0b9cffe4f4 Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_explicit 2015-10-08 09:56:44 -06:00
Sujin Philip
715ddedd25 Merge topic 'add-implicit-functions'
5ea70b6d Add implicit functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !232
2015-10-08 11:41:17 -04:00
Patricia Kroll Fasel - 090207
5569d8c1b1 Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_uniform 2015-10-08 09:35:10 -06:00
Sujin Philip
5ea70b6ddd Add implicit functions 2015-10-08 09:32:14 -04:00
Kenneth Moreland
e5bcc17d35 Merge branch 'cuda-problems' into 'master'
Do not use _Pragma in code blocks with CUDA

The current CUDA compiler is crashing when using _Pragma in code blocks,
which were being used with clang on apple. Turn these off when compiling
with CUDA.

See merge request !234
2015-10-07 19:00:10 -04:00
Kenneth Moreland
bfb26cf71b Do not use _Pragma in code blocks with CUDA
The current CUDA compiler is crashing when using _Pragma in code blocks,
which were being used with clang on apple. Turn these off when compiling
with CUDA.
2015-10-07 15:40:44 -06:00
Robert Maynard
fbddba74a1 Merge topic 'cellset_permutation'
9a8809f9 Add CellSetPermutation which allows custom iteration over a cell set.
66f6db5a IsWriteableArrayHandle now can tell if an array handle can be written too
20f3fb50 Update VertexClustering to use vtkm::cont::CellSetSingleType.
154896b7 Extend the test for DataSetSingleType.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !228
2015-10-07 16:21:40 -04:00
Robert Maynard
75c2dac786 Merge topic 'retrieve-cell-set-by-name'
a9425ac1 In DataSet, add the ability to retrieve a cell set by name.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !215
2015-10-07 14:00:48 -04:00
T.J. Corona
a9425ac1bb In DataSet, add the ability to retrieve a cell set by name. 2015-10-02 08:31:57 -04:00
Robert Maynard
bafda6c348 Merge topic 'replace_OutOfMemory_with_BadAllocation'
f38673f6 Replace ErrorControlOutOfMemory with ErrorControlBadAllocation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !229
2015-10-02 08:11:15 -04:00
Robert Maynard
f38673f618 Replace ErrorControlOutOfMemory with ErrorControlBadAllocation. 2015-10-01 14:25:28 -04:00
Robert Maynard
085711e2d2 Merge topic 'bad-allocation-error'
a88f43db Add Bad Allocation error.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !213
2015-10-01 14:19:57 -04:00
Robert Maynard
9a8809f933 Add CellSetPermutation which allows custom iteration over a cell set.
When you create a CellSetPermutation you provide an array of the cell ids that
you want to iterate. This allows the user to do custom blanking of a data set,
or to do multi iteration over a set of cells.
2015-10-01 09:23:10 -04:00
Robert Maynard
66f6db5a97 IsWriteableArrayHandle now can tell if an array handle can be written too 2015-10-01 09:23:10 -04:00
Robert Maynard
20f3fb5000 Update VertexClustering to use vtkm::cont::CellSetSingleType. 2015-10-01 09:23:10 -04:00
Robert Maynard
154896b7bc Extend the test for DataSetSingleType. 2015-10-01 08:50:54 -04:00
Robert Maynard
ac48e13c3a Merge topic 'cleanup_cellset_explicit'
8bc40880 Add a test for CellSetExplicit::GetIndices
fa81d1de CellSetExplicit always calls methods using "this->"
9e496306 Allow incremental construction of CellSetSingleType.
3e307879 Mark CellSetExplicit::Fill as host side only.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !227
2015-09-30 13:48:08 -04:00
Sujin Philip
757891cfcc Merge topic 'fix-ArrayHandleTransform'
f3560116 Fix ArrayHandleTransform to use supplied functor object instead of a default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !224
2015-09-30 11:58:55 -04:00
Robert Maynard
8bc4088068 Add a test for CellSetExplicit::GetIndices 2015-09-30 11:29:07 -04:00
Robert Maynard
fa81d1de7f CellSetExplicit always calls methods using "this->" 2015-09-30 11:20:33 -04:00
Robert Maynard
9e4963069b Allow incremental construction of CellSetSingleType. 2015-09-30 11:18:49 -04:00
Robert Maynard
3e3078798c Mark CellSetExplicit::Fill as host side only. 2015-09-30 11:18:49 -04:00
Robert Maynard
9965977f47 Merge topic 'FetchTagTopologyIn_return_shape_type'
a1f5bc9f FetchTagTopologyIn updated to properly return CellShape.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !209
2015-09-30 10:18:17 -04:00
Robert Maynard
ee42cd7c5e Merge topic 'more_efficient_FlatToLogicalCellIndex'
0bd27169 ConnectivityStructuredInternals computes FlatToLogicalCellIndex faster.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !220
2015-09-30 10:17:48 -04:00
Kenneth Moreland
de939c13b2 Merge branch 'array-handle-group-vec' into 'master'
Add ArrayHandleGroupVec

This is a fancy array handle that groups consecutive entries in a delegate array handle and presents them as a single vec.


See merge request !226
2015-09-29 23:42:18 -04:00
Kenneth Moreland
1432b160d5 Remove const from ArrayPortalGroupVec.
Remove the const from the ValueType of the delegate portal in
ArrayPortalGroupVec. This was creating a Vec with a const type, which
was immutable, which was problematic when trying to create the Vec in
the first place.
2015-09-29 16:06:39 -04:00
Sujin Philip
f35601162e Fix ArrayHandleTransform to use supplied functor object instead of a default 2015-09-29 15:44:10 -04:00
Patricia Kroll Fasel - 090207
0e8b9b15a5 Compiler warnings. 2015-09-29 13:39:30 -06:00
Patricia Kroll Fasel - 090207
810e6b002a Fix CastTo with template to avoid compiler errors. 2015-09-29 11:57:39 -06:00
Patricia Kroll Fasel - 090207
5a7b3668ee Correct for gcc and pgi compilers and CastTo. Add CellSetSingleType for output. 2015-09-29 11:20:05 -06:00