Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,222 Commits 8 Branches 22 Tags 30 MiB
52467474aa
Commit Graph

1222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Maynard
8d5765f55f Revert the VTKM_EXEC_EXPORT changes. 2015-09-02 20:01:22 -04:00
Robert Maynard
f2502c2e58 Merge topic 'unused_variable_warning' 
7fb4ed12 Fix warnings in IsosurfaceUniformGrid code.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !177
 2015-09-02 18:09:12 -04:00
Robert Maynard
7fb4ed12fe Fix warnings in IsosurfaceUniformGrid code. 2015-09-02 17:58:18 -04:00
Kenneth Moreland
be1524409d Merge branch 'optimize-uniform-coordinates' into 'master' 
Optimize uniform coordinates

Add specializations when dealing with uniform coordinates on lines, quads (a.k.a. pixels), and hexahedra (a.k.a. voxels).

See merge request !172
 2015-09-02 17:16:57 -04:00
Kenneth Moreland
20c5819397 Remove unused typedef 
A typedef in a method was left over from a copy/paste. Although
harmless, it was causing a (valid) warning on some compilers.
 2015-09-02 13:54:54 -07:00
Kenneth Moreland
68428c6487 Add test to make sure uniform coords work in topology map 
Although this is labeled as a unit test, this is more of an integration
test to make sure that when a uniform point coordinate is passed as a
field to a WorkletTopologyMap from points to cells with a regular cell
set, you get the specialized VecRectilinearPointCoordinates in the
worklet argument.
 2015-09-02 13:54:54 -07:00
Kenneth Moreland
08f9c04fab Add specialization of topology map fetch for regular point coords 
In the special case where you are loading the point coordinates for a
structured grid in a point to cell map (an important use case), create a
VecRectilinearPointCoordinates rather than build a Vec of the values.
This will activate the cell specalizations in previous commits.

These changes also added some flat-to-logical index conversion and vice
versa in ConnectivityStructuredInternals. This change also fixed a bug
in getting cells attached to points in 2D grids. (Actually, technically
someone else fixed it and checked it in first. The changes were merged
during a rebase.)

I also added a specalization to Vec for 1D that implicitly converts
between the 1D Vec and the component. This can be convenient when
templating on the Vec length.
 2015-09-02 13:54:51 -07:00
Kenneth Moreland
b58543297a Special implementation of cell derivative for rectilinear cells 2015-09-02 13:50:31 -07:00
Kenneth Moreland
284fda03fd Special implementation of cell interpolate for rectilinear cells 2015-09-02 13:50:31 -07:00
Kenneth Moreland
493656e419 Special implementation of parametric coordinates for rectilinear cells 2015-09-02 13:50:31 -07:00
Kenneth Moreland
429f9c0cb7 Add VecRectilinearPointCoordinates class 
This class implicitly stores the point coordinates for a rectilinear
cell (such as a voxel) with just the location of the lower left point
and the spacing in each dimension. In addition to saving space, this
class should allow cell-specific functions to specialize for faster
processing.
 2015-09-02 13:50:31 -07:00
Kenneth Moreland
294e8843cb Merge branch 'misc-fixes' into 'master' 
Misc fixes

Miscellaneous fixes to errors and warnings that are popping up during the code sprint.

See merge request !175
 2015-09-02 16:49:14 -04:00
Kenneth Moreland
c5e9ce4769 Fix compiler warnings for isosurface code 2015-09-02 13:47:48 -07:00
Kenneth Moreland
9749e57838 Fix pyexpander errors 
There was some inconsistencies between the input and output files for
pyexpander checked into the repository. This just makes them consistent.
 2015-09-02 13:47:33 -07:00
Robert Maynard
ed463d903c Merge topic 'opengl_interop_iterator_deref' 
41b40ae3 Always pass raw memory pointers to glBufferSubData.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !170
 2015-09-02 16:42:06 -04:00
Sujin Philip
6fde50160b Update VertexClustering to use the new features in vtkm 2015-09-02 16:41:54 -04:00
Sujin Philip
8a11f9b302 Merge topic 'missing_install_headers' 
ed3949b4 install DispatcherBaseDetailInvoke but don't test build it.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !173
 2015-09-02 16:24:55 -04:00
Christopher Sewell
7fc0b25bdb Merge topic 'isosurface-render-example' 
493ca4e0 Merging with master
a10d1fc2 Removing unnecessary cell fields from isosurface test and example, and adding a few comments
70c49b14 Changing translation for isosurface example
a96da4e0 Moving viewpoint for IsosurfaceUniformGrid example
30100e2a Adding examples directory with isosurface rendering example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !163
 2015-09-02 16:22:21 -04:00
Christopher Meyer Sewell - 188584
493ca4e0c6 Merging with master 2015-09-02 14:18:05 -06:00
Robert Maynard
ed3949b4c7 install DispatcherBaseDetailInvoke but don't test build it. 2015-09-02 16:03:56 -04:00
Kenneth Moreland
06db9fdd29 Merge branch 'topic-additional-Pi-constants' into 'master' 
Add other Pi fraction constants and 2Pi

Add Pi constant helper functions for Pi halves, thirds, fourths, and 2 * Pi

See merge request !169
 2015-09-02 15:46:45 -04:00
Christopher Meyer Sewell - 188584
a10d1fc237 Removing unnecessary cell fields from isosurface test and example, and adding a few comments 2015-09-02 12:03:49 -06:00
Jeremy Meredith
2ae2df9a8f Merge branch 'newtopology' into 'master' 
adding cell-to-point topology support and worklet

This adds code to support a cell-to-point topological mapping worklet.

For explicit cell set, there is code to calculate a cell-to-point topology from the canonical point-to-cell topology.  (It is not parallelized at this point.)  Most of the required code for structured grids was already in place.

See merge request !154
 2015-09-02 13:34:54 -04:00
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
04a4812965 Add DeviceAdapter preprocessor logic 2015-09-02 10:10:07 -07: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