Kenneth Moreland
3ced871709
Merge branch 'misc-compiler-warnings' into 'master'
...
Miscellaneous compiler warnings
Address some compiler warnings in some optional testing code that is not turned on in a lot of dashboards.
See merge request !223
2015-09-29 11:27:28 -04:00
Kenneth Moreland
7404f4edda
Wrap boost include.
...
Wrap VTKM_THIRDPARTY_PRE_INCLUDE and VTKM_THIRDPARTY_POST_INCLUDE around
a boost include. This suppresses some warnings.
2015-09-29 10:25:27 -04:00
Kenneth Moreland
2e64a4e296
Fix warning about wrong type in GL call
...
Was storing a size in std::size_t and giving that to OpenGL functions,
which are using GLsizeiptr.
2015-09-29 10:24:34 -04:00
Patricia Kroll Fasel - 090207
c87b4f50da
Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_explicit
2015-09-28 16:25:50 -06:00
Patricia Kroll Fasel - 090207
deceb79edc
Fix to work with gcc and pgi compilers. Change to use CellSetSingleType.
2015-09-28 16:23:03 -06:00
Patricia Kroll Fasel - 090207
f624683eea
Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_uniform
2015-09-28 09:51:25 -06:00
Robert Maynard
66715584f2
Merge topic 'single_cell_type_cellset'
...
c0f3b6ff Make3DExplicitDataSetCowNose now generates a CellSetSingleType.
011849a2 Add CellSetSingleType
c58f8ef1 CellSetExplicit Getters now properly deduce the correct handle type.
5a3e7c77 CellSetExplicit CreateConnectivity works even when NumberOfPoints is zero.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !219
2015-09-28 09:46:50 -04:00
Tyson Neuroth
0bd27169b5
ConnectivityStructuredInternals computes FlatToLogicalCellIndex faster.
...
By caching the CellDimensions and the size of a XY slice of cells we can
improve the performance of flat index to i,j,k for cells.
2015-09-25 17:07:11 -04:00
Robert Maynard
c0f3b6ff97
Make3DExplicitDataSetCowNose now generates a CellSetSingleType.
2015-09-25 13:41:41 -04:00
Robert Maynard
011849a251
Add CellSetSingleType
2015-09-25 13:41:41 -04:00
Robert Maynard
c58f8ef193
CellSetExplicit Getters now properly deduce the correct handle type.
...
Previously the CellSetExplicit presumed that the CellToPoint and PointToCell
Storage tags matched, which they don't when using custom storage tags.
2015-09-25 13:41:41 -04:00
Robert Maynard
5a3e7c779e
CellSetExplicit CreateConnectivity works even when NumberOfPoints is zero.
...
Previously if you created a cell set explicit and didn't set the number of
points you would get a runtime error when you over-ran an array's bounds.
Now we account for this use case and properly generate the Cell To Point
Connectivity.
2015-09-25 13:41:41 -04:00
Robert Maynard
9c85c623f0
Merge topic 'cellset_explicit_user_defined_offsets'
...
dbed8827 Correct issues found in code review.
82b977da CellSetExplicit::CreateConnectivity now works with implicit NumIndices.
30f5d628 ConnectivityExplicit will not generate IndexOffsets when they are implicit.
f04ea6d7 CellSetExplicit has userdefined offset storage.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !212
2015-09-25 13:24:56 -04:00
Robert Maynard
dbed882709
Correct issues found in code review.
2015-09-25 12:32:06 -04:00
Kenneth Moreland
a70b4543a2
Merge branch 'fix-test-equal' into 'master'
...
Fix issue with test_equal of numbers equal 0
There was an error in the test_equal comparison that would return true
when the second value was 0 (or close to 0) and the first value was not.
This was a bug I introduced with commit
b270438fea8a9fe4200322bfe6344ab2075c4d9a. I clearly misinterpreted how a
conditional worked.
See merge request !218
2015-09-25 10:47:42 -04:00
Kenneth Moreland
fcfe63ef85
Fix unnecessary warning about divide by zero.
...
Again. Hopefully I got it right this time.
2015-09-24 21:52:58 -06:00
Kenneth Moreland
fa0c695424
Fix issue with test_equal of 0 numbers
...
There was an error in the test_equal comparison that would return true
when the second value was 0 (or close to 0) and the first value was not.
This was a bug I introduced with commit
b270438fea8a9fe4200322bfe6344ab2075c4d9a. I clearly misinterpreted how a
conditional worked.
2015-09-24 16:48:03 -06:00
Patricia Kroll Fasel - 090207
78239c5571
Minor corrections for Allocate of shapes, numindices.
2015-09-24 16:17:50 -06:00
Patricia Kroll Fasel - 090207
a821310b6f
Changes in CellSetExplicit for shape and numindices types. Made one Run() method
...
by getting point dimensions from the dataset.
2015-09-24 16:07:45 -06:00
Robert Maynard
5c1e82e837
Merge topic 'suppress_more_host_device_warnings'
...
fc79055f Add suppression pragmas to exec::Fetch classes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !211
2015-09-24 14:00:29 -04:00
Patricia Kroll Fasel - 090207
3e4ca9ae8f
Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_uniform
2015-09-24 11:55:33 -06:00
Patricia Kroll Fasel - 090207
3e94b4295b
Types for shapes and numindices changed in CellSetExplicit.
2015-09-24 11:52:38 -06:00
Patricia Kroll Fasel - 090207
c7234eedf7
Merge branch 'master' of gitlab.kitware.com:Fasel/vtk-m into tetra_explicit
2015-09-24 11:10:20 -06:00
Patricia Kroll Fasel - 090207
a7f7b46169
Add 3D tetrahedralize of explicit cell set.
2015-09-24 10:56:03 -06:00
Robert Maynard
82b977da0e
CellSetExplicit::CreateConnectivity now works with implicit NumIndices.
2015-09-24 12:38:34 -04:00
Robert Maynard
30f5d628cc
ConnectivityExplicit will not generate IndexOffsets when they are implicit.
...
Even when using implicit index's the ConnectivityExplicit would generate
the code to compute the IndexOffsets, which would than fail to compile as
the ArrayHandle would only support read operations. This fixes that issue.
2015-09-24 11:57:34 -04:00
Robert Maynard
f04ea6d72e
CellSetExplicit has userdefined offset storage.
2015-09-24 11:24:50 -04:00
Robert Maynard
45ad63c770
Merge topic 'update_cell_connectivity_types'
...
19cebccf Correct issues that buildbot brought up in the code.
c6dbc0f2 GetNumberOfPointsInCell consistently returns a vtkm::IdComponent
25ff1e94 CellSetExplicit storage tags are now easier to override.
935b3fd6 CellSetExplicit uses UInt8 for shape, and IdComponent for numIndices.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !210
2015-09-24 11:23:54 -04:00
Robert Maynard
fc79055f76
Add suppression pragmas to exec::Fetch classes
2015-09-24 10:39:48 -04:00
Robert Maynard
19cebccf11
Correct issues that buildbot brought up in the code.
2015-09-24 10:15:44 -04:00
Patricia Kroll Fasel - 090207
409e94108a
Pass in number of indices for use by POLYGON shape.
...
const on operator() params
2015-09-23 15:25:07 -06:00
Patricia Kroll Fasel - 090207
4e92cd3f33
Tetrahedralize 2D explicit dataset first version with opengl example
2015-09-23 14:43:27 -06:00
Robert Maynard
c6dbc0f20e
GetNumberOfPointsInCell consistently returns a vtkm::IdComponent
2015-09-23 15:47:41 -04:00
Robert Maynard
25ff1e9403
CellSetExplicit storage tags are now easier to override.
2015-09-23 15:47:41 -04:00
Robert Maynard
935b3fd6b9
CellSetExplicit uses UInt8 for shape, and IdComponent for numIndices.
2015-09-23 11:17:04 -04:00
Kenneth Moreland
5cb44a7a00
Merge branch 'easier-cast-and-call' into 'master'
...
Add new version of DynamicArrayHandle::CastToArrayHandle
This takes a reference to an array handle and fills it. This removes a lot of the pain of determining template arguments.
See merge request !205
2015-09-23 11:01:18 -04:00
Robert Maynard
768938f728
Merge topic 'deprecate_warnings'
...
dda098e8 Suppress Deprecation warnings about glut in the examples.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !208
2015-09-23 10:46:02 -04:00
Robert Maynard
a1f5bc9f0a
FetchTagTopologyIn updated to properly return CellShape.
2015-09-23 10:45:06 -04:00
Robert Maynard
dda098e80f
Suppress Deprecation warnings about glut in the examples.
2015-09-23 09:00:51 -04:00
Patricia Kroll Fasel - 090207
1c19a15f51
Triangulate a 2D data set extension
2015-09-22 11:40:01 -06:00
T.J. Corona
a88f43db94
Add Bad Allocation error.
2015-09-22 10:54:22 -04:00
Robert Maynard
17a649da94
Merge branch 'cuda_75_pragma_for_exec_warnings' into 'master'
...
Cuda 75 pragma for exec warnings
See merge request !207
2015-09-22 10:50:57 -04:00
Patricia Kroll Fasel - 090207
efb7775cf4
Use CUDA and TBB if available
2015-09-21 15:23:14 -06:00
Patricia Kroll Fasel - 090207
e22e42eacc
Use ExecutionWholeArray to pass connectivity as Invoke.
2015-09-21 14:22:27 -06:00
Robert Maynard
cf4db42bba
Merge branch 'cuda_warnings' into 'master'
...
Cuda warnings
See merge request !206
2015-09-21 15:28:44 -04:00
Robert Maynard
778d670ed3
FunctionInterface suppresses warnings on calling host function from host/device
2015-09-21 15:26:28 -04:00
Robert Maynard
00b732056d
Make a define to suppress false positive host/device warnings
2015-09-21 14:25:15 -04:00
Robert Maynard
46dc67c336
Suppress warnings from examples.
2015-09-21 14:17:25 -04:00
Robert Maynard
970ec3f426
Remove conversion warning from opengl interop code.
2015-09-21 14:17:25 -04:00
Robert Maynard
056f69bf96
Remove unused variable and conversion warnings from cuda code.
2015-09-21 14:17:25 -04:00