Sujin Philip
54c30cbc66
Select step 4 implementation method
...
Performance testing has shown that the combined lower-bounds + update-connectivity
worklet is marginally, but consistently faster than DeviceAdapterAlgorithm::LowerBounds
followed by an update-connectivity worklet. It also requires less memory.
2015-09-16 10:29:31 -04:00
Sujin Philip
7f017c1106
Release ArrayHandle resources sooner to avoid OOM
2015-09-16 10:07:25 -04:00
Sujin Philip
bab41d2191
Workaround thrust scan bug
2015-09-16 10:07:25 -04:00
Sujin Philip
b5e74682b7
Add support for more cell types
2015-09-16 10:07:25 -04:00
Sujin Philip
002e5b6cda
Fix lowerbounds implementation and collect timing information
2015-09-15 17:29:21 -04:00
Sujin Philip
9a911a9761
Merge topic 'update-VertexClustering'
...
6fde5016 Update VertexClustering to use the new features in vtkm
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !174
2015-09-04 14:34:44 -04:00
Robert Maynard
5bc89c5d8a
Correct a member initialization reorder warning.
2015-09-04 09:49:10 -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
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
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
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 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
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
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
617e64cd9a
Allow the user to use an ArrayHandle for the field for IsoSurface.
2015-09-02 01:04:48 -04:00
Jeremy Meredith
d1492cca24
Merge branch 'master' into newtopology
2015-09-01 19:46:18 -04:00
Christopher Meyer Sewell - 188584
30100e2ae8
Adding examples directory with isosurface rendering example
2015-09-01 17:09:36 -06: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
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
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
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
69f5a39931
IsosurfaceUniformGrid can now handle non square volumes.
2015-08-28 16:48:19 -04:00
Robert Maynard
ae7f8441e1
IsosurfaceUniformGrid updated to latest cell shape types.
...
Mainly the fact that voxel has been merged into hexahedron.
2015-08-28 16:33:17 -04:00
Robert Maynard
4de11a353e
Update IsosurfaceUniformGrid to new coordinate system and worklet classes.
2015-08-28 16:32:17 -04:00
Robert Maynard
2fd7ce3554
IsosurfaceUniformGrid Run now templated on device adapter to execute on.
...
Also fixes warnings in IsosurfaceUniformGrid.
2015-08-28 16:12:21 -04:00
Christopher Meyer Sewell - 188584
d61aedd8bb
Moving functors inside IsosurfaceFilterUniformGrid, and templating on DeviceAdapter
2015-08-28 16:12:21 -04:00
Christopher Meyer Sewell - 188584
b99d252dc8
Fixing some Windows build errors related to typename and a non-const array declaration
2015-08-28 16:12:21 -04:00
Christopher Meyer Sewell - 188584
125c1ca818
Addition to previous check-in: Minor modifications to IsosurfaceUniformGrid.h based on Robert's suggestions
2015-08-28 16:12:21 -04:00
Christopher Meyer Sewell - 188584
a19489d03e
Minor modifications to IsosurfaceUniformGrid.h based on Robert's suggestions
2015-08-28 16:12:21 -04:00
Christopher Meyer Sewell - 188584
f7b031f1fb
First version of uniform grid isosurface using new data model and topology worklet
2015-08-28 16:12:21 -04:00
Jeremy Meredith
5d6b9bb9ac
Merge branch 'master' into newtopology
2015-08-28 16:09:29 -04:00
Robert Maynard
7b185003b2
UnitTestCellAverage now properly tests 2DRegularDataSet.
2015-08-28 16:08:27 -04:00
Kenneth Moreland
89c72c9975
Update clip and external faces code to new cell shapes
...
The names of the cell shapes and header files changed superficially. The
check in missed the clip and external faces. Update that code.
There are also some less superficial changes that allow you to manage
cell shapes with tags. It might be worthwhile to update this code to use
that new infrastructure.
2015-08-28 12:48:00 -06:00
Jeremy Meredith
2987142fa6
adding support and tests for cell-to-point topology worklet.
2015-08-28 14:03:13 -04:00
Kenneth Moreland
827b58a8f2
Merge branch 'shape-specific-functions' into 'master'
...
Shape specific functions
These changes support creating methods that are specific to cell shape in worklets (issue #27 ).
See merge request !149
2015-08-28 13:21:21 -04:00
Kenneth Moreland
3e251de469
The CellShape fetch returns a tag rather than ID.
...
Previously, when you requested a CellShape in the ExecutionSignature,
you just got an ID stored in a vtkm::IdComponent. This change returns a
cell shape tag of the appropriate type (or generic if the type is not
known at compile time). This will allow functions called from the
worklet to specialize on the cell type better.
2015-08-27 16:31:06 -06:00
Kenneth Moreland
5b47354058
Rename CellType to CellShape.
...
We have been using the term "shape" in the cell set and connectivity
classes. To be consistent, use the term "shape" for the geometric
identify of the cell everywhere.
2015-08-27 16:25:59 -06:00
