Commit Graph

900 Commits

Author SHA1 Message Date
Robert Maynard
07cd0f0516 All scatters VisitIndex now are zero based.
Fixes #166
2017-08-08 09:38:04 -04: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
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
Yenpure
f799547e97 Resolving error in interpolation
-Both the rectilinear grid and uniform grid evaluator
 had interpolation errors
 a typical interpolation  equation looks like,
 out = (1-t) * in1 + t * in2
 The final interpolation step lacked multiplying in2
 by t
2017-07-25 15:55:39 -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
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
25139ea372 Merge remote-tracking branch 'vtkm/master' into particle_statuses 2017-07-20 11:03:49 -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
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
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
ca9b16c203 Provide comprehensive status checks
-Added methods to query statuses
-Refactor code
2017-07-17 13:59:25 -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
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
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
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
Dave Pugmire
b86ca21b6d Cleanup for merge.
Renamed filter classes to worklet.
Removed some dead code.
2017-07-08 15:54:44 -04:00
ayenpure
f209d670be Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into PICS 2017-07-07 15:01:24 -04:00
ayenpure
02116fadc9 Updating build files.
Updating build files to properly build the particle advection filter.
2017-07-07 14:17:41 -04:00
ayenpure
0495b2f224 Updated BOV reader and removed unnecessary files.
Removed the PICS.h file which was the initial file for the particle advection
filter. Updated the BOV reader for compile warning fixes and formatting issues.
2017-07-07 14:05:56 -04:00
David C. Lonie
fb2d36be1e Refactor VecRectilinearPointCoordinates.
See #163.
2017-07-07 13:49:35 -04:00
ayenpure
f5c59a01e8 Updates for particle advection files.
- removing tabs, and trailing whitespaces.
- removing compile warnings for clang and gcc.
2017-07-07 13:46:45 -04:00
ayenpure
b2765881df removing most of the compile warnings, and adding CUDA and TBB tests for rectilinear grids 2017-07-07 13:46:45 -04:00
ayenpure
14af69a8b5 resolving warnings in grid evaluator calculations 2017-07-07 13:46:45 -04:00
ayenpure
fc8d2a27b2 improved regular grid evaluator and added rectilinear grid evaluator 2017-07-07 13:46:45 -04:00
Dave Pugmire
818257e3b4 Add doing particles in rounds. 2017-07-07 13:46:45 -04:00
Dave Pugmire
a08a4602a9 Tweaked the particle advetion filter. 2017-07-07 13:46:25 -04:00
Dave Pugmire
ec5d9a2fdb Major changes for streamlines and particles. Does them in rounds for streamlines. 2017-07-07 13:46:25 -04:00
Dave Pugmire
37f69f271b Fix cuda compile error. 2017-07-07 13:46:25 -04:00
Dave Pugmire
0ad373c3f8 Add in some initial code for streamlines. 2017-07-07 13:46:25 -04:00
Dave Pugmire
2e0ab2950b Cleaned the Particles class 2017-07-07 13:45:52 -04:00
Dave Pugmire
5308a20e90 Cleanup. 2017-07-07 13:45:52 -04:00
Bernd Hentschel
06e73ef3f2 fixed int conversion warning 2017-07-07 13:45:52 -04:00