Robert Maynard
82fe85430f
Merge branch 'make_cont_export_macro_be_device_host' into 'master'
...
Make cont export macro be device host
See merge request !166
2015-09-02 13:27:38 -04:00
Robert Maynard
41b40ae380
Always pass raw memory pointers to glBufferSubData.
2015-09-02 13:26:33 -04:00
Robert Maynard
548ab890a0
Merge branch 'make_IsosurfaceUniformGrid_use_FieldType_everywhere' into 'master'
...
Prefer FieldType over float in IsosurfaceUniformGrid.h
See merge request !167
2015-09-02 13:18:38 -04:00
hschroot
2d2ca40b3f
Add other Pi fraction constants and 2Pi
2015-09-02 10:06:02 -07:00
Jeremy Meredith
dc14ed4f87
adding unit test to confirm cell-to-point connectivity works.
2015-09-02 12:27:30 -04:00
Jeremy Meredith
8544fb8ca4
adding topology types to explicit cell set connectivity array accessors.
2015-09-02 12:26:37 -04:00
Robert Maynard
3c9da9676e
Prefer FieldType over float in IsosurfaceUniformGrid.h
2015-09-02 11:38:26 -04:00
Robert Maynard
37403237c6
Allow us to still use __ldg texture load with the new VTKM_EXEC_CONT_EXPORT.
2015-09-02 11:34:36 -04:00
Robert Maynard
c8e0e2ca62
VTKM_EXEC_EXPORT now functions as __device__ __host__
2015-09-02 11:30:16 -04:00
Sujin Philip
a313faa8d1
Merge topic 'add-ArrayHandleCast'
...
a1c74bd1 Add ArrayHandleCast
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !160
2015-09-02 11:05:13 -04:00
Robert Maynard
f413941aa7
Merge branch 'make_sure_to_use_cuda_execution_policy' into 'master'
...
Cuda copy from host to device can't use the cuda execution policy.
See merge request !165
2015-09-02 10:29:03 -04:00
Robert Maynard
8422108f28
Cuda copy from host to device can't use the cuda execution policy.
2015-09-02 09:53:00 -04:00
Robert Maynard
258bcf9fce
Merge branch 'call_isosurface_with_array_handle_field' into 'master'
...
Allow the user to use an ArrayHandle for the field for IsoSurface.
See merge request !164
2015-09-02 09:51:50 -04:00
Robert Maynard
617e64cd9a
Allow the user to use an ArrayHandle for the field for IsoSurface.
2015-09-02 01:04:48 -04:00
Robert Maynard
3980b5966c
Merge branch 'make_sure_to_use_cuda_execution_policy' into 'master'
...
All occurrences of thrust invocation uses an execution policy.
See merge request !162
2015-09-01 20:30:43 -04:00
Christopher Meyer Sewell - 188584
70c49b14c0
Changing translation for isosurface example
2015-09-01 18:22:40 -06:00
Christopher Meyer Sewell - 188584
a96da4e053
Moving viewpoint for IsosurfaceUniformGrid example
2015-09-01 18:09:15 -06:00
Jeremy Meredith
d1492cca24
Merge branch 'master' into newtopology
2015-09-01 19:46:18 -04:00
Robert Maynard
efc9f0c5cf
All occurrences of thrust invocation uses an execution policy.
2015-09-01 19:32:49 -04:00
Christopher Meyer Sewell - 188584
30100e2ae8
Adding examples directory with isosurface rendering example
2015-09-01 17:09:36 -06:00
Jeremy Meredith
f027d0335a
fixing cell-to-point conn generation to not use intermediate storage.
2015-09-01 18:56:32 -04:00
Robert Maynard
bf4b9309c0
Merge branch 'isosurface-merge-fix' into 'master'
...
Adding back point coordinate computations in isosurface worklet
See merge request !161
2015-09-01 18:55:25 -04:00
Jeremy Meredith
11708c6ef7
automatically build connectivity as needed.
2015-09-01 18:37:17 -04:00
Sujin Philip
a1c74bd15a
Add ArrayHandleCast
2015-09-01 17:42:45 -04:00
Robert Maynard
04e791ad3d
Merge branch 'missing_install_headers' into 'master'
...
Missing install headers
See merge request !159
2015-09-01 17:13:15 -04:00
Christopher Meyer Sewell - 188584
74dcd1c5cc
Adding back point coordinate computations in isosurface worklet
2015-09-01 15:00:31 -06:00
Robert Maynard
775acfd30b
Install DispatcherBaseDetailInvoke.h header
2015-09-01 16:09:08 -04:00
Jeremy Meredith
407d1619d0
one more warning
2015-09-01 15:06:17 -04:00
Jeremy Meredith
c9d3ae3dcf
more warnings
2015-09-01 14:54:56 -04:00
Jeremy Meredith
e28402aed1
yet more warning fixes
2015-09-01 14:22:13 -04:00
Jeremy Meredith
94b8b9f5b0
more warning fixes
2015-09-01 14:11:47 -04:00
Jeremy Meredith
52458e853f
fixing some warnings
2015-09-01 14:03:12 -04:00
Jeremy Meredith
1b01d824c6
Merge branch 'fix_structured_pt_to_cell' into 'master'
...
fixing 2d structured connectivity calc for logical point indices.
`CalculateLogicalPointIndices` in `ConnectivityStructuredInternals.h` for 2D grids was incorrect -- it was using cell dimensions instead of point dimensions. This fixes the calculation and the unit test for the data set.
See merge request !153
2015-09-01 13:48:04 -04:00
Jeremy Meredith
50cfa823ba
applying indexing fixes for structured grids
2015-09-01 12:56:32 -04:00
Jeremy Meredith
4a6c9d540f
add more fixes to structured indexing
2015-09-01 12:33:26 -04:00
Robert Maynard
1df19f23e2
Merge branch 'remove_bad_doxygen_namespaces' into 'master'
...
Remove namespaces from doxygen that don't exist.
See merge request !157
2015-09-01 11:12:20 -04:00
Robert Maynard
bc388a6df4
Merge branch 'remove_bad_doxygen_namespaces' into 'master'
...
Remove namespaces from doxygen that don't exist.
See merge request !157
2015-08-31 23:47:19 -04:00
Robert Maynard
334d13b6d2
Merge branch 'correct_magnitude_export' into 'master'
...
Correct magnitude export
See merge request !158
2015-08-31 23:28:19 -04:00
Robert Maynard
ef8e76a597
Restrict the Magnitude worklet signature to vectors of 3 components.
...
The class was implemented to only handle vectors of 3 components, now
state that in the ControlSignature.
2015-08-31 22:49:53 -04:00
Robert Maynard
7db2df8ed9
Make sure the vtkm::Magnitude can be used from worklets.
2015-08-31 22:49:53 -04:00
Robert Maynard
86b3f9a08c
Remove namespaces from doxygen that don't exist.
2015-08-31 13:06:44 -04:00
Robert Maynard
5ab136c5c0
Merge branch 'isosurface-out-of-bounds' into 'master'
...
IsosrufaceUniformGrid now i,j,k position from cell dims correctly.
See merge request !156
2015-08-31 12:56:20 -04:00
Robert Maynard
7a6fd7840c
IsosrufaceUniformGrid now i,j,k position from cell dims correctly.
2015-08-31 08:30:21 -04:00
Robert Maynard
9cb00d9048
Merge branch 'isosurface-for-sprint' into 'master'
...
Isosurface for sprint
See merge request !150
2015-08-29 09:42:21 -04:00
Robert Maynard
24d0346dce
Fix warnings generated with gcc-4.8
2015-08-28 17:28:22 -04:00
Jeremy Meredith
f62f1755e7
the value after the name in the cell set constructor is dimensionality, not numcells.
2015-08-28 16:57:06 -04:00
Jeremy Meredith
8afee80e55
updating newly merged code with changes for new connectivity types.
2015-08-28 16:56:09 -04:00
Robert Maynard
359a207e13
Merge topic 'CellAverage_use_correct_data_generators'
...
7b185003 UnitTestCellAverage now properly tests 2DRegularDataSet.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !152
2015-08-28 16:51:57 -04:00
Jeremy Meredith
8999567dd2
fixing 2d structured connectivity calc for logical point indices.
2015-08-28 16:48:24 -04:00
Robert Maynard
69f5a39931
IsosurfaceUniformGrid can now handle non square volumes.
2015-08-28 16:48:19 -04:00
