Commit Graph

3577 Commits

Author SHA1 Message Date
Yenpure
f43580b5b5 Merge branch 'particle_statuses' of https://gitlab.kitware.com/ayenpure/vtk-m into particle_statuses 2017-07-21 14:34:51 -04:00
Yenpure
ca167f3671 Changes suggested by Rob.
-member variable names changed to VTKm convention
-changed directive VTKM_EXEC_CONT to VTKM_EXEC
 for methods executing on the device
-explicitly shifting in enum for statuses instead
 of numbers
2017-07-21 14:32:01 -04:00
Yenpure
f5173153b4 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into particle_statuses 2017-07-21 09:51:36 -04:00
Robert Maynard
6eb38b4bde Merge topic 'ArrayManagerExecutionCuda_cast_warnings'
76532264 Correct signed to unsigned warnings in ArrayManagerExecutionCuda.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !842
2017-07-21 08:17:07 -04:00
Yenpure
c85c6c93ff Fix compile errors after Dave's merge.
-Fix enum changes in the Worklets
-Fix method chanages in teh Worklets
2017-07-20 14:04:21 -04:00
Yenpure
5ba1fad76e Merge branch 'particle_statuses' of https://gitlab.kitware.com/ayenpure/vtk-m into particle_statuses 2017-07-20 13:50:09 -04:00
Yenpure
2aea25c889 Fix compile errors after merging Dave's changes
-Changes in the Worklets class which did not reflect
 changes from the Particles class
2017-07-20 13:48:40 -04:00
Yenpure
9e9b4f8838 Merge branch 'particle_statuses' of https://gitlab.kitware.com/ayenpure/vtk-m into particle_statuses 2017-07-20 11:09:38 -04:00
Yenpure
25139ea372 Merge remote-tracking branch 'vtkm/master' into particle_statuses 2017-07-20 11:03:49 -04:00
Dave Pugmire
017c7c3e0f Merge topic 'PICS_returntype'
80e725df Merge branch 'PICS_returntype' of gitlab.kitware.com:dpugmire/vtk-m into PICS_returntype
d768d313 Merge branch 'PICS_returntype' of gitlab.kitware.com:dpugmire/vtk-m into PICS_returntype
8bdf42f3 Change return type to a struct that contains the arrays from the worklet.
d2bc02e6 Return a vtkm::cont::DataSet from ParticleAdvection worklet.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !843
2017-07-20 10:53:43 -04:00
Robert Maynard
76532264c3 Correct signed to unsigned warnings in ArrayManagerExecutionCuda. 2017-07-20 10:42:09 -04:00
Matt Larsen
5fc8051712 initial version on absorption and emission integration 2017-07-20 07:30:42 -07:00
Dave Pugmire
80e725df68 Merge branch 'PICS_returntype' of gitlab.kitware.com:dpugmire/vtk-m into PICS_returntype 2017-07-20 07:52:26 -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
James Kress
67336251a8 Merge topic 'Rendering-Scaling-Fix'
2dd00acf Removing hold over cmake change.
58deb3eb Fixing View1d and View2d x scaling.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !840
2017-07-20 07:16:25 -04:00
Thomas J. Otahal
ad13e9b412 Merge branch 'master' into external-faces-production 2017-07-19 13:54:36 -06:00
Thomas J. Otahal
ab25c160ed External Faces Uniform and Rectilear grids
Added new Run method to External Faces worklet to support
uniform and rectilinear grids, taking advantage of the grids
regular strucuture to speed-up computation.

Changed External Faces filter to call the proper Run method
in the External Faces worklet based on cell set type.

Added tests for uniform and rectilinear grids to External Faces
filter unit test.
2017-07-19 13:35:31 -06:00
Matt Larsen
ed4c7bc106 Merge topic 'remove_open_mp'
8d6f60b3 Removing references to VTKM_DEVICE_ADAPTER_OPENMP since it does not exist and will fail to compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !844
2017-07-19 10:37:59 -04:00
Yenpure
ddde549688 Resolving MSVC compile warnings.
Particles.h(170): warning C4800: '__int64': forcing value to bool
'true' or 'false' (performance warning)
2017-07-19 10:21:02 -04:00
Yenpure
9d82ce233a Merge branch 'particle_statuses' of https://gitlab.kitware.com/ayenpure/vtk-m into particle_statuses 2017-07-19 10:07:45 -04:00
mclarsen
8d6f60b38d Removing references to VTKM_DEVICE_ADAPTER_OPENMP since it does not exist and will fail to compile 2017-07-18 14:19:54 -07:00
Dave Pugmire
d2bc02e69e Return a vtkm::cont::DataSet from ParticleAdvection worklet. 2017-07-18 16:54:17 -04:00
Yenpure
96fe9f8537 Refining status for particles 2017-07-18 14:49:20 -04:00
Yenpure
0107b40704 Removing dump output for streamlines 2017-07-18 13:59:02 -04:00
Yenpure
079d1a7ff5 Remove extra statuses and enum stuff
-removing additional statuses
-trying to fix CUDA compile warnings
2017-07-18 11:34:54 -04:00
Yenpure
86b3d64b69 Merge branch 'master' into particle_statuses 2017-07-17 14:46:28 -04:00
Yenpure
ca9b16c203 Provide comprehensive status checks
-Added methods to query statuses
-Refactor code
2017-07-17 13:59:25 -04:00
James
2dd00acfca Removing hold over cmake change. 2017-07-17 11:22:29 -04:00
James
58deb3eb42 Fixing View1d and View2d x scaling. 2017-07-17 09:58:15 -04:00
ayenpure
7bd963cba9 Changes got better performance with particle status
Removed the separate class for particle status.
Made changes wherever needed
2017-07-16 23:40:36 -04:00
Yenpure
ef3a83229e Refactor to accomodate particle status
-Remove class ParticleStatus and move status related
 things to the particles class
-Add a base class for particles
2017-07-14 16:31:39 -04:00
Yenpure
7d65c341d1 Write particle status back to the array 2017-07-13 16:46:42 -04:00
David Lonie
dd0b81aea8 Merge topic 'ArrayTransferBenchmark'
760c5856 Add BenchmarkArrayTransfer.
379c3a0f Use current device when allocating managed memory.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !837
2017-07-13 16:44:14 -04:00
David C. Lonie
760c5856f0 Add BenchmarkArrayTransfer.
This will let us measure performance while tuning CUDA managed memory
hints.
2017-07-13 15:17:02 -04:00
Yenpure
98babb5dc6 Particle Status Changes
-Adding comprehensive status tracking for particles
-Updating old code to support reading and updating status
 according to new the ParticleStatusClass.
2017-07-13 13:59:31 -04:00
David C. Lonie
379c3a0fad Use current device when allocating managed memory. 2017-07-13 12:55:22 -04:00
Yenpure
644a385fb6 Partial Checkin : Adding ParticleStatus class
Adding class similar to particle status from VisIt.
Dropped some of the statuses from VisIt as they may
not be needed.
Added class to CMakeLists to compile it, but it is
not used anywhere yet.
2017-07-13 10:35:00 -04:00
David Lonie
a2238f673b Merge topic 'fix-type-warning'
6a6e55b5 Fix warning on gcc 7.1.1.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !833
2017-07-13 10:04:45 -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
David Lonie
0f1ce4760f Merge topic 'basic-array-leak-fix'
49d57c0d Fix memory leak in ArrayHandleBasicImpl.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !835
2017-07-12 17:12:40 -04:00
David C. Lonie
6a6e55b534 Fix warning on gcc 7.1.1.
Implicit cast from size_t to int was triggering a couple thousand
warnings on the new GCC.
2017-07-12 15:35:12 -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
Dave Pugmire
69c1f946c5 Merge branch 'PICS' of gitlab.kitware.com:dpugmire/vtk-m into PICS 2017-07-12 12:01:49 -05:00
Dave Pugmire
b87e888139 Merge branch 'PICS' of gitlab.kitware.com:dpugmire/vtk-m into PICS 2017-07-12 10:43:21 -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
Robert Maynard
3a71c58e4f Merge topic 'doxygen_tweaks'
98f8c2e0 Doxygen now excludes the thrust policy namespace.
cb4cae86 Cleanup the aligned allocator doxygen.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !834
2017-07-12 08:54:31 -04:00
Dave Pugmire
6f1e9b40a3 Fix compile warning. 2017-07-12 00:39:40 -05:00