Commit Graph

581 Commits

Author SHA1 Message Date
Patricia Kroll Fasel - 090207
f3766449f2 Cosmology halo finder
Running friend of friends algorithm and then NxN most bound particle
after to find halo center. Cosmology center finder running NxN MBP
algorithm followed by a estimator reducing the problem to MxN MBP
to speed up run.
2017-09-06 11:43:40 -06:00
caseywang777
317cff0dd8 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into NDHistogram 2017-09-02 19:13:04 -04:00
caseywang777
fd30187d53 Add 'N-dimensional histogram, histogram marginalization and entropy calculation worklets and filters' 2017-09-02 18:35:21 -04:00
Dave Pugmire
400981815f Remove warnings. 2017-08-29 09:58:25 -04:00
Dave Pugmire
b2de8045cb Cleanup. Add some additional tests for streamlines. 2017-08-29 08:35:29 -04:00
Dave Pugmire
7e69b9606d Fix merges with master. 2017-08-28 16:58:44 -04:00
Dave Pugmire
1c0f721b96 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into streamline_returntype 2017-08-28 15:27:04 -04:00
Kenneth Moreland
3471dc27fe Expand usage of AverageByKey
The AverageByKey.h header file had a single function that used the
device adapter algorithm ReduceByKey method to do a simple averaging of
a field. I added a second method that can do an average when given a
vtkm::worklet::Keys object. I expect this to be a common use case as we
implement transforming fields from input to output in many algorithms.
2017-08-24 17:20:21 -06:00
Kenneth Moreland
8312fe54ab Merge topic 'cononical-face-edge-ids'
1d5a4d47 Update ExternalFaces worklet to use hashes
fc7b90ac Add hash function
b1e6c1e3 Add method for getting a cononical edge id
8e72dc73 Add method for getting a cononical face id

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !900
2017-08-24 19:00:21 -04:00
Robert Maynard
ce80383238 Adds WorkletPointNeighborhood and DispatcherPointNeighborhood types.
VTK-m is now able to run algorithms on structured points that require the
local point neighbors in a highly efficient manner.
2017-08-23 16:42:00 -04:00
Kenneth Moreland
8e72dc738a Add method for getting a cononical face id
The cononical face id is stored in a vtkm::Id3 (independent of the
actual number of points in the face).
2017-08-17 15:48:47 -06:00
Sujin Philip
2141435a19 Refactor KDTree3D worklet 2017-08-17 15:25:08 -04:00
ayenpure
2c662457f0 Fix particle advection compile warnings 2017-08-10 22:19:50 -04:00
ayenpure
84f9ec47ee Fix particle advection build warning
-adding code to resolve build warnings for gcc 5+
-change the return object of steps in unit test
2017-08-10 21:32:42 -04:00
Dave Pugmire
b23564a526 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into pics_unittests 2017-08-10 16:18:18 -04:00
Abhishek Yenpure
e4116edab8 particle advection tests for rectilinear grid
-added tests for rectilinear grid
-fixing rectilinear grid evaluator for GPUs
2017-08-10 15:14:42 -04:00
Abhishek Yenpure
a3b4ad8b1a particle advection test fixes
-fixes for testing particle advection on the GPU.
-minor fixes for GPU
2017-08-10 13:39:47 -04:00
Thomas Otahal
89b2700298 Merge topic 'external-faces-production'
75517554 Move check for cell variables to it gets executed.
147247e8 Code formatting changes and compiler warning fixes.
a3fd135b Fix errors and warnings on Mac and Windows
347af497 Poly Data for External Faces
aeed7a07 Cell variables for External Faces
ad13e9b4 Merge branch 'master' into external-faces-production
ab25c160 External Faces Uniform and Rectilear grids

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !860
2017-08-09 16:00:01 -04:00
ayenpure
bc259e1523 Particle advection grid evaluators testing fix 2017-08-08 23:03:08 -04:00
Yenpure
9714ea36fa Particle advection test fix
-Added a worklet to execute evaluator test on device
-Fixing various compile issues
2017-08-08 16:19:02 -04:00
Robert Maynard
07cd0f0516 All scatters VisitIndex now are zero based.
Fixes #166
2017-08-08 09:38:04 -04:00
Yenpure
0daeee70ec Fix Needed : virtual like methods for Integrators 2017-08-03 16:55:44 -04:00
Yenpure
2ba83cd101 particle advection refactoring
-removing the bounds object form integrators.
-some formatting changes
-changes to build successfully
2017-08-03 13:34:58 -04:00
Thomas J. Otahal
347af49722 Poly Data for External Faces
The external faces filter and worklet now pass input
PolyData (0D, 1D, and 2D) cells to the output. The external
faces filter has a flag to control this output (PassPolyData).
Added tests to the external faces filter and worklet.
2017-08-03 09:19:22 -06:00
Allison Vacanti
75590f1fc9 MSVC2013 lacks support for function type aliases.
Alas, VS 2013 will keep us from using "using" to declare function
signatures. Reverting to typedef until we bump our MSVC requirement.

This appears to be a compiler bug:
https://stackoverflow.com/questions/26349216
2017-08-02 12:02:25 -04:00
Yenpure
3668e098e3 Fixed particle advection build issues
-Merged short steps changes from AYenpure's branch
-Fixed build issues
-Fixedf merge issues
2017-08-02 10:02:21 -04:00
Yenpure
4b7bba836b Merge branch 'refactor_integrators' of https://gitlab.kitware.com/ayenpure/vtk-m into pics_unittests 2017-08-01 22:00:07 -04:00
Dave Pugmire
33ada346ae Add more unittests. Put field into evaluator. 2017-08-01 16:27:03 -04:00
Yenpure
61c61ee93b Adding a base class for Integrators 2017-07-31 15:46:13 -04:00
Kenneth Moreland
897ec9ff5e Test and fix issues with WholeCellSetIn with structured grids 2017-07-28 15:02:05 -06:00
Kenneth Moreland
03b6f62d05 Add a test for the WholeCellSetIn argument
All types of cell sets should have a consistent interface. This is
tested (and fixed) for explicit and permutation cell sets. However, an
unfixed bug that has been identified is that permutation cell sets only
work for point to cell topologies. All others are not supported
correctly.
2017-07-28 13:46:37 -06:00
Dave Pugmire
6a480bad65 Fix compiler warnings. Add ArrayHandle method for getting cell id 2017-07-27 10:10:43 -04:00
ayenpure
c564c4b911 Enhancements for particle advection
-support for short steps to push the particle out of bounds
2017-07-25 23:30:17 -04:00
Dave Pugmire
45c82f2e93 First take at getting streamline worklet to return useful information.
More changes to come.
2017-07-21 14:37:20 -04:00
Dave Pugmire
d768d3130c Merge branch 'PICS_returntype' of gitlab.kitware.com:dpugmire/vtk-m into PICS_returntype 2017-07-20 07:41:11 -04:00
Dave Pugmire
8bdf42f31c Change return type to a struct that contains the arrays from the worklet. 2017-07-20 07:36:57 -04:00
Dave Pugmire
d2bc02e69e Return a vtkm::cont::DataSet from ParticleAdvection worklet. 2017-07-18 16:54:17 -04:00
Abhishek
58a08287bb Merge topic 'PICS'
8e500a17 Moving PortalType templetization to Step method of Integrators
33150365 Validate the data format for the UniformGridEvaluate.
69c1f946 Merge branch 'PICS' of gitlab.kitware.com:dpugmire/vtk-m into PICS
b87e8881 Merge branch 'PICS' of gitlab.kitware.com:dpugmire/vtk-m into PICS
5a652f41 Fix for MSVC compile isses
50dbd634 Remove unneeded template from grid eval glasses.
6f1e9b40 Fix compile warning.
32a0be8b Fix compile warnings/errors from CDash.
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !828
2017-07-13 09:41:33 -04:00
Yenpure
8e500a172a Moving PortalType templetization to Step method of Integrators
Changes suggested by Rob.
2017-07-12 15:31:16 -04:00
Dave Pugmire
33150365eb Validate the data format for the UniformGridEvaluate. 2017-07-12 12:02:04 -05:00
Yenpure
5a652f41bc Fix for MSVC compile isses
MSVC does not allow typename for non templated types while
compiling with c++98 std. (clang/gcc allow it)
Don't know about which standards Kitware uses to test builds, but
this should fix it.
Also removing unused parameter from the particle advection example.
2017-07-12 10:52:39 -04:00
Dave Pugmire
50dbd6347a Remove unneeded template from grid eval glasses. 2017-07-12 08:38:32 -05:00
Dave Pugmire
6f1e9b40a3 Fix compile warning. 2017-07-12 00:39:40 -05:00
Dave Pugmire
32a0be8bc7 Fix compile warnings/errors from CDash. 2017-07-11 23:33:29 -05:00
Dave Pugmire
4574f36dec Cleanup of particle advection worklets
Created ParticleAdvection.h for worklets that match the worklet pattern.
Slight reorganization of existing code to match this pattern.
Added a unittest particle advection.
2017-07-11 21:22:28 -05:00
Li-Ta Lo
5bf0bfe11a Merge topic 'kdtree'
37ded1cf Resolve code review issues, 1. cudaDeviceSetLimit issue, 2. Namespace issue
bf11195d Resolve the code review issues
75c794f6 Add 3D kd tree reconstruction and nearest neighbor searh

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !797
2017-07-11 11:40:39 -04:00
caseywang777
37ded1cf69 Resolve code review issues, 1. cudaDeviceSetLimit issue, 2. Namespace issue 2017-07-10 10:52:47 -06:00
David C. Lonie
fb2d36be1e Refactor VecRectilinearPointCoordinates.
See #163.
2017-07-07 13:49:35 -04:00
Robert Maynard
5de351124a Allow Gradient to output in FORTRAN ordering.
VTK expects that the tensor fields generated by the gradient of a vector field
to have FORTRAN ordering instead of C ordering.

Discovering this actually uncovered bugs in the Vorticity and QCriterion
implementation where they presumed FORTRAN ordering, and would generate
incorrect results.
2017-07-05 16:32:31 -04:00
Robert Maynard
8d04796b1f Allow Vector Gradient computation to output fancy fields and not gradient
Basically we can run the gradient worklet and compute the Divergence, Vorticity,
and QCriterion without ever having to store the gradient tensor in global memory
2017-07-03 16:11:01 -04:00
Robert Maynard
85a62423bd Gradient now has a Run method, and requires ArrayHandle type to be known
The gradient worklet is now templated on the input value type. This simplifies
the logic of the gradient. Secondly we have added a Run method for the
first step of making gradient a 'fatter' worklet that can handle generation
of vorticity, Divergence, and QCriterion.
2017-07-03 16:11:01 -04:00
Sujin Philip
67a95ee19a Merge topic 'fix-marchingcubes-normals'
08fb95d5 Options to compute fast normals in MarchingCubes
74f1a0bf Fix Marching Cubes normals
42ce2dcb Add ScatterPermutation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !811
2017-06-21 09:39:08 -04:00
David Lonie
462033699f Merge topic '157-threshold_field_refactor'
1cc855ab Refactor the Threshold worklet field mapping.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !808
2017-06-21 09:12:10 -04:00
David C. Lonie
1cc855abec Refactor the Threshold worklet field mapping.
Refs #157.
2017-06-21 09:09:46 -04:00
David Lonie
8c0d1d12d0 Merge topic '157-extract_geometry_refactor'
769c3c40 Extract geometry celldata refactor.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !803
2017-06-20 16:18:06 -04:00
Sujin Philip
42ce2dcb39 Add ScatterPermutation 2017-06-20 13:41:02 -04:00
David C. Lonie
769c3c405e Extract geometry celldata refactor.
References #157.
2017-06-16 14:34:26 -04:00
caseywang777
75c794f6c0 Add 3D kd tree reconstruction and nearest neighbor searh 2017-06-15 17:55:30 -06:00
David C. Lonie
63aecfa501 Refactor field processing for Mask worklet/filter. 2017-06-15 13:17:52 -04:00
David C. Lonie
20eed197c1 Refactor the clip filters/worklet (See #157). 2017-06-13 10:24:07 -04:00
Sujin Philip
75f0957f8c Merge topic 'add-SmoothSurfaceNormals'
18d0f3e1 Add SmoothSurfaceNormals worklet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !798
2017-06-12 17:21:45 -04:00
Sujin Philip
18d0f3e143 Add SmoothSurfaceNormals worklet
Also updates SurfaceNormals filter to produce smooth normals.
2017-06-12 16:50:22 -04:00
David Lonie
8c64247707 Merge topic 'marching_cubes_celldata'
c9f38480 Release CellIdMap if no cell fields exist in MC filter.
44c1d4f6 Remove unused variable.
82ebdd5b Add MarchingCubes::ProcessCellField.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !793
2017-06-09 09:50:47 -04:00
David C. Lonie
82ebdd5be7 Add MarchingCubes::ProcessCellField.
Allow cell data to be mapped through the MarchingCubes filter.
2017-06-08 16:50:27 -04:00
Sujin Philip
6ce2a43d41 Simplify ArrayHandleTransform template 2017-06-08 16:46:45 -04:00
Sujin Philip
749c0c8920 Add Worklet and Filter for faceted surface normals 2017-06-08 09:37:12 -04:00
Sujin Philip
fbabd58222 Simplify ExtractStructured implementation 2017-05-30 17:07:14 -04:00
Robert Maynard
5dd346007b Respect VTK-m convention of parameters all or nothing on a line
clang-format BinPack settings have been disabled to make sure that the
VTK-m style guideline is obeyed.
2017-05-26 13:53:28 -04:00
Kitware Robot
4ade5f5770 clang-format: apply to the entire tree 2017-05-25 07:51:37 -04:00
Robert Maynard
705dac67b3 Remove improper defines of the default device adapter.
Worklets should never set or define the default device adapter
2017-05-23 15:13:27 -04:00
Kitware Robot
cbd918b43d worklet/wavelet: fix whitespace issues 2017-05-22 16:47:54 -04:00
Robert Maynard
206556916d Merge topic 'support_3DWavelet_compression'
fecc2e97 code style improvements
7782ff47 Take off a few debug statements; replaced tabs with spaces
3e4095f4 WaveletDWT.h
c4853885 eliminate another warning
d4deced5 get rid of some asserts used for debugging
98cf7f8d got rid of unused variable warnings
33de20da fix print type warnings
7d123455 remove my own note
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !765
2017-05-22 14:01:03 -04:00
Kitware Robot
efbde1d54b clang-format: sort include directives 2017-05-18 12:59:33 -04:00
Samuel Li
33de20da09 fix print type warnings 2017-05-10 23:18:03 -06:00
Samuel Li
d5d67bc5a9 Merge remote-tracking branch 'vtkm/master' 2017-05-10 23:06:32 -06:00
Samuel Li
e21795b269 restore original CMakeLists 2017-05-10 22:53:55 -06:00
Samuel Li
b58e76b675 eliminate a few warnings 2017-05-10 17:58:42 -06:00
Samuel Li
d9c3c7b393 all cases pass tests on all platforms. Need to tackle warnings 2017-05-10 15:51:06 -07:00
Samuel Li
a73bc25939 finish all tests in serial mode 2017-05-09 23:02:51 -06:00
Patricia Kroll Fasel - 090207
8a840d7698 Fix warnings 2017-05-04 15:04:54 -06:00
Patricia Kroll Fasel - 090207
d80e64385a Add ExtractGeometry filter and unit test 2017-05-04 13:13:53 -06:00
Patricia Kroll Fasel - 090207
9106f6b4b7 Add ExtractPoints filter which only does ImplicitFunction extraction 2017-05-03 15:07:06 -06:00
Patricia Fasel
5a4c029719 Merge topic 'extract-structured'
6a88cde5 Remove unnecessary const parameters
0e3a98f8 Add subsample and include boundary
14066d86 Add filter for ExtractStructured
e4283344 Clean up
78148b02 Rectilinear with subset and sample and tests
49f86625 Uniform subset and sample worklet and unit tests working
d7a53792 Use vtkm:Bounds for all bounding boxes
0975e189 Introduce subsampling parameter
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !744
2017-05-03 10:21:14 -04:00
Sujin Philip
82d02e46ef Modify ImplicitFunctions to use Virtual Methods 2017-05-01 16:55:59 -04:00
Patricia Kroll Fasel - 090207
0e3a98f827 Add subsample and include boundary 2017-04-27 14:53:51 -06:00
Samuel Li
f11c1bf928 change new error handling 2017-04-14 14:14:09 -06:00
Patricia Kroll Fasel - 090207
78148b0295 Rectilinear with subset and sample and tests 2017-04-14 14:06:28 -06:00
Samuel Li
eaee6c3e4b merge from the latest 2017-04-14 14:00:16 -06:00
Patricia Kroll Fasel - 090207
49f8662572 Uniform subset and sample worklet and unit tests working 2017-04-14 13:34:51 -06:00
Samuel Li
10be50059c sync to debug on another machine 2017-04-13 18:25:14 -06:00
Patricia Kroll Fasel - 090207
d7a5379293 Use vtkm:Bounds for all bounding boxes 2017-04-13 14:45:53 -06:00
Patricia Kroll Fasel - 090207
0975e1894a Introduce subsampling parameter 2017-04-13 12:36:53 -06:00
Patricia Kroll Fasel - 090207
9d8d5ed5d3 Pass Vec instead of arrays for bounds and samples. Check validity of values. 2017-04-10 15:56:00 -06:00
Samuel Li
14a94e7886 fix a typo; sync to test 2017-04-06 17:57:40 -06:00
Patricia Kroll Fasel - 090207
f9a77e053d UnitTest of geometry only on worklet 2017-04-06 14:11:49 -06:00
Patricia Kroll Fasel - 090207
de419db1de Geometry for Uniform, Rectilinear 1D,2D,3D. 2017-04-05 12:33:05 -06:00
Patricia Kroll Fasel - 090207
d2eb251bb4 Separate ExtractUniform and ExtractRectilinear 2017-04-05 09:36:25 -06:00
Patricia Kroll Fasel - 090207
6256324195 Start of ExtractStructured worklet which only gathers geometry 2017-04-04 14:00:04 -06:00
Patricia Kroll Fasel - 090207
836e947200 VTKM_EXEC on operator caused CUDA synchronization error 2017-03-30 11:22:07 -06:00
Patricia Kroll Fasel - 090207
f3b4b29e40 Use float not double for defining ImplicitFunctions 2017-03-29 16:24:42 -06:00
Patricia Kroll Fasel - 090207
c7e0305097 Warnings 2017-03-29 15:13:34 -06:00
Patricia Kroll Fasel - 090207
be97785036 Change subset extraction on points to use WorkletMapCellToPoint 2017-03-29 14:04:58 -06:00
Patricia Kroll Fasel - 090207
11e0a252d9 Floating point warnings 2017-03-28 16:07:56 -06:00
Patricia Kroll Fasel - 090207
16c211816c Add in Mask.h worklet and test 2017-03-28 14:42:22 -06:00
Patricia Kroll Fasel - 090207
9f06a1ea37 Merge branch 'master' into extract-subset 2017-03-27 08:58:17 -06:00
Patricia Kroll Fasel - 090207
36b480993d Move the processing of scatter cell data to worklet from the filter. 2017-03-24 16:34:53 -06:00
Patricia Kroll Fasel - 090207
3a1a6aece3 Added mapping of cell data onto output dataset 2017-03-23 17:14:39 -06:00
Patricia Kroll Fasel - 090207
984af5a2b4 Reorganize Triangulate and Tetrahedralize and write filters. 2017-03-23 11:58:00 -06:00
Patricia Kroll Fasel - 090207
6cb3f9165d Merge branch 'master' into extract-subset 2017-03-22 11:18:34 -06:00
Patricia Kroll Fasel - 090207
9f0c99920c Add filters and tests for ExtractPoints and ExtractGeometry, by id only. 2017-03-21 15:14:35 -06:00
Patricia Kroll Fasel - 090207
54171e1d87 Third version of ExtractGeometry which finally looks more like
Threshold.  CellSetSingleType returned for extract points and
CellSetPermutation returned for extract cells.
2017-03-20 14:40:53 -06:00
Patricia Kroll Fasel - 090207
d1e8de3efe Add ExtractCellSetStructured by id, by implicit function, 2D, 3D 2017-03-17 17:00:59 -06:00
Patricia Kroll Fasel - 090207
ad66b2be33 Add extraction subdirectory. ExtractGeometry entry point for point and
cell extraction.
2017-03-16 14:53:16 -06:00
Patricia Kroll Fasel - 090207
9583e627dc Add ExtractCells by Id and by ImplicitFunction 2017-03-16 13:44:01 -06:00
Robert Maynard
5566afdd8d Allow MarchingCubes to handle multiple iso-contour values. 2017-03-16 11:49:20 -04:00
Patricia Kroll Fasel - 090207
8598711c09 ExtractPoints worklet for ImplicitFunction
Add Box to ImplicitFunction
2017-03-14 12:14:50 -06:00
Kenneth Moreland
6fdc7eb8c0 Add Field::GetRange and CoordinateSystem::GetBounds to library
Following what was done with ArrayRangeCompute, the GetRange and
GetBounds methods are embedded into the vtkm_cont library for the most
common type lists.

Also, and probably more importantly, the device adapter is no longer one
of the arguments for either of these methods. It is no longer needed as
ArrayRangeCompute no longer needs it.
2017-03-09 13:18:36 -05:00
Samuel Li
85d09a55d8 add a flag to facilitate testing 2017-03-08 19:29:27 -08:00
Patricia Kroll Fasel - 090207
fa0b9bee73 MaskPoints worklet and filter added 2017-03-08 16:04:12 -07:00
Patricia Kroll Fasel - 090207
c1b2d1f50a Add filter and unit test to ThresholdPoints.
Allow for CompactPoints to call CleanGrid.
2017-03-08 13:25:27 -07:00
Patricia Kroll Fasel - 090207
dee28a3089 ThresholdPoints first attempt 2017-03-07 14:03:22 -07:00
Samuel Li
2ee208b833 add back all the timers 2017-02-25 18:49:12 -08:00
Samuel Li
62d82974c9 implement 3D gaussian generation 2017-02-25 17:19:33 -07:00
Samuel Li
0a6a26248e fix test program to not use L vector 2017-02-25 13:23:40 -07:00
Samuel Li
4d22303c6b fix bug on operating on 32bit float 2017-02-24 16:40:14 -07:00
Samuel Li
0c260370c5 1024 cube 1 level of transform pass test 2017-02-24 11:56:24 -07:00
Sujin Philip
a88807fd7e Catch all exceptions by reference 2017-02-23 13:25:01 -05:00
Samuel Li
c22ff73bc5 debug for 3D transforms 2017-02-21 16:56:57 -07:00
Kenneth Moreland
d339025a1b Merge topic 'external-face-more-generic'
dcbbb727 Merge branch 'master' into external-face-more-generic
0703139a Make Keys class do in-place sort
059c7f6d Fix issue with ExternalFaces on CellSetSingleType
876514ba Add better test for external faces
53679dfc Update ExternalFaces to support mixed face types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brent Lessley <blessley@cs.uoregon.edu>
Merge-request: !662
2017-02-16 10:28:56 -05:00
Thomas Otahal
9d9c39e197 Merge topic 'vector_magnitude_field_filter'
ba2be2fe Added FilterTraits and code cleanup.
f6d5d24c Removed integer vector field from vector magnitude filter unit test
70e145fd Attempt to fix Visual Studio 2013/2015 warning message
f1300c61 Changed vtkm::Abs() to return input type
71b2348d Adjusted Math.h.in for const vtkm::Float32 function inputs
7d6601d7 Modified Math.h.in and VectorAnalysis.h to support integral types.
cd95cbe9 Modified Math.h.in instead of Math.h
5777c4ca Merge branch 'master' into vector_magnitude_field_filter
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !666
2017-02-10 11:34:28 -05:00
Kenneth Moreland
dcbbb72784 Merge branch 'master' into external-face-more-generic
Update exception methods to new names.
2017-02-08 17:10:17 -07:00
David C. Lonie
f601e38ba8 Simplify exception hierarchy.
Remove the ErrorControl class such that all subclasses now inherit from
error. Renamed all exception classes via s/ErrorControl/Error/.

See issue #57.
2017-02-07 15:42:38 -05:00
Kenneth Moreland
0703139a3d Make Keys class do in-place sort
Previously, the Keys class constructor took an array of keys, made a
copy of it, and sorted the copy. This was to protect the caller in case
it needed the original keys array again. However, this copy takes a
significant chunk of time and it is probably rare in practice to ever
need the original keys array again. So instead just do an in-place sort.
2017-01-26 13:35:53 -07:00
Kenneth Moreland
876514bab2 Add better test for external faces
Tests zoo cells with different face size. Also makes sure the surface is
exactly as expected.
2017-01-26 13:35:49 -07:00
Kenneth Moreland
53679dfc9c Update ExternalFaces to support mixed face types
Previously, ExternalFaces really only supported tetrahedral meshes that
have only triangular faces. These changes support all mixes of cells and
their faces.
2017-01-26 13:35:46 -07:00
Thomas J. Otahal
5777c4caa5 Merge branch 'master' into vector_magnitude_field_filter
Conflicts:
	vtkm/worklet/testing/CMakeLists.txt
2017-01-24 09:55:31 -07:00
Kenneth Moreland
28b866920f Merge branch 'reduce-by-key-worklet' into 'master'
Reduce by Key Worklet Type

See merge request !645
2017-01-19 16:25:06 -05:00
Thomas J. Otahal
556b922733 Created a filter for the vector magnitude worklet.
Modified the vector magnitude worklet to accept VecAll instead
of Vec3 and return Scalar. Modified the Magnitude() and Sqrt() functions
to return FloatDefault for all inputs except for Float64.

Perhaps we should modify other functions in Math.h and VectorAnalysis.h to
return float types for intergral arguments instead of integral types?
2017-01-19 13:27:42 -07:00
Kenneth Moreland
d6eb477a45 Minor fixes to UnitTestWorkletReduceByKey 2017-01-17 15:53:17 -07:00
Kenneth Moreland
72b85559c2 Add ReducedValues[In][Out] tags to WorkletReduceByKey 2017-01-17 15:53:13 -07:00
Kenneth Moreland
ffa3b167b5 Add ValueCount tag to WorkletReduceByKey 2017-01-17 15:53:10 -07:00
Kenneth Moreland
add10f56cf Add Value[In][Out] tags for WorkletReduceByKey
This lets you give arrays of values paired with the keys that will be
grouped into (hopefully) small Vecs.
2017-01-17 15:53:08 -07:00
Kenneth Moreland
58eb8f168d Add WorkletReduceByKey and dispatcher
And the basic type for a reduce by key worklet and its associated
adapter. Right now the worklet only supports passing in keys. Values
come next.
2017-01-17 15:53:06 -07:00
Kenneth Moreland
cd64b69a55 Add Keys class
This class will manage the keys during a reduce-by-key worklet
execution.
2017-01-17 15:53:04 -07:00
Robert Maynard
4a56e9f129 Merge branch 'contour-tree' into 'master'
Contour tree

See merge request !658
2017-01-17 17:00:54 -05:00
Kenneth Moreland
713cf4228a Make it not possible to create a cell set without specifying num points
The CellSetExplicit and CellSetSingleType classes have an ivar that
marks the number of points. There were several instances of code
creating cell sets without specifying the number of points. This can be
very bad if subsequent code needs that information.
2017-01-12 13:02:10 -07:00
Patricia Kroll Fasel - 090207
b3b5149b28 Use cont/testing/MakeTestDataSet.h and add contour tree tests.
Remove worklet/contourtree/PrintVectors.h from CMakeLists.txt.
2017-01-12 10:40:29 -07:00
Patricia Kroll Fasel - 090207
62a1cceea6 Add file that creates test data sets and use that instead for contour tree. 2017-01-09 15:50:23 -07:00
Patricia Kroll Fasel - 090207
f6140c39e2 Add LANL/LLC copyright notification. 2017-01-09 14:53:59 -07:00
Patricia Kroll Fasel - 090207
9412584bf2 First implementation of contour tree 2D and 3D, serial and cuda. 2017-01-09 13:54:47 -07:00