Commit Graph

712 Commits

Author SHA1 Message Date
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
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
efc9f0c5cf All occurrences of thrust invocation uses an execution policy. 2015-09-01 19:32:49 -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
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
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
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
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
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
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
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
Robert Maynard
7b185003b2 UnitTestCellAverage now properly tests 2DRegularDataSet. 2015-08-28 16:08:27 -04:00
Jeremy Meredith
3eff4022c4 Merge branch 'shape-clip-merge' into 'master'
Update clip and external faces with shape changes

See merge request !151
2015-08-28 16:06:44 -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
Kenneth Moreland
688eafe5f8 Tests catch STL exceptions and report on their names. 2015-08-28 12:19:46 -06:00
Sujin Philip
7f0ab06600 Merge topic 'add-custom-operator-exclusive-scan'
514ac54e Add custom operator and initial value support to ExclusiveScan

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !148
2015-08-28 14:15:39 -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
Sujin Philip
514ac54e59 Add custom operator and initial value support to ExclusiveScan 2015-08-28 09:56:04 -04:00
Kenneth Moreland
33edcc940d Make sure variables are initialized in error conditions
There are several switch statements in ParametricCoordinates.h that have
a default clause that is an error condition. The code was simply calling
the RaiseError method on the worklet before quiting. Although the
behavior is supposed to be similar to throwing an exception, flow
actually does still continue. These error default clauses kept going
without breaking from the switch or initializing the variables the
method is supposed to set. Although the values should not matter once
the error is raised, I was getting compiler warnings about it. It's also
bad practice as certain NaN values can cause the program to signal out,
so it is best to set the data to something.
2015-08-27 22:13:19 -06:00
Kenneth Moreland
9abaf0190f Fix gcc warnings
Fixed some gcc warnings about unused scoped typedefs and implicit
conversion issues.
2015-08-27 17:39:45 -06:00
Kenneth Moreland
47818553cb Forgot to add export macro to CellShapeTagGeneric
That caused an error when used in CUDA.
2015-08-27 17:34:28 -06:00
Kenneth Moreland
947178e7e4 Remove pixel and voxel cell types
These cell types are inherited from VTK, but they are basically the same
as quad and hexahedron, respectively. The only useful difference is that
pixel and voxel are supposed to be axis aligned, but you cannot
determine that by the cell shape alone (at least not just from the cell
set).

A big issue with these is that their indexing is different that of quad
and hex. The development team had a long discussion about the benefits
of the alternate indexing, but after consulting with Berk Geveci and
Will Schroder from the VTK team, that indexing is not really taken
advantage of at the cell level. Thus, it is really just a nuisance in
VTK-m.
2015-08-27 17:03:13 -06:00
Kenneth Moreland
ed6ff1e931 Return VecVariable when getting cell to point in structured
When getting cell indices in a cell to point structured connectivity, it
was previously returning a vtkm::Vec of the maximum size and setting
invalid indices to -1. This is changed to vtkm::VecVariable, which will
reflect the actual number of indices.

I thought I made this change a while ago, but I guess I missed it.
2015-08-27 16:49:24 -06:00
Kenneth Moreland
fe65124922 Change the way polygons are interpolated.
The original way was overconstrained with respect to the number of
parametric coordinates.

Also implemented WorldCoordinatesToParametricCoordinates for polygons.
2015-08-27 16:31:08 -06:00
Kenneth Moreland
5bcad152e0 WorldCoordinatesToParametricCoordinates functions
The general polygon version is not implemented yet because I need to
change the way it is interpolated.

To get wedge to work correctly, I had to change the interpolation
slightly there. Previously the interpolation had a singularity at
the tip.
2015-08-27 16:31:07 -06:00
Kenneth Moreland
936bbd33d0 Add Newton's Method function. 2015-08-27 16:31:07 -06:00
Kenneth Moreland
a7c33b5c07 Make cell code more consistent.
The functions for doing interpolations and derivatives were called
CellInterpolate and CellDerivative, but the file names were
Interpolate.h and Derivative. Now the files are CellInterpolate.h and
CellDerivative.h so they are more consistent and a bit easier to find.

The interpolate and derivative functions has the shape tag at end of the
function arguments (just before the "worklet" parameter, which is just
the error handling mechanism). However, the parametric coordinate
functions had the shape tag at the beginning. Moved the shape tag to the
end to be more consistent within these functions and also in other uses
throughtout VTK-m.
2015-08-27 16:31:07 -06:00
Kenneth Moreland
457720bd63 Add derivative functions. 2015-08-27 16:31:07 -06:00
Kenneth Moreland
5a896c6ce7 Add tests for interpolate functions.
Also tests the current parametric coordinates methods. The added test
lead to some minor corrections and additions.
2015-08-27 16:31:06 -06:00
Kenneth Moreland
29766bd3a2 Add queries for standard parametric coordinates.
Be able to get the parametric coordinates for the center and the nodes
of each cell shape.
2015-08-27 16:31:06 -06:00
Kenneth Moreland
9551824c8e Add methods to interpolate all cell types. 2015-08-27 16:31:06 -06: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
f5f5523c25 Add CellTraits class
Currently it is pretty empty. It might make sense to roll this into the
CellShapeTag, but we may add more information later.
2015-08-27 16:31:05 -06:00