Commit Graph

123 Commits

Author SHA1 Message Date
Kenneth Moreland
c3a3184d51 Update copyright for Sandia
Sandia National Laboratories recently changed management from the
Sandia Corporation to the National Technology & Engineering Solutions
of Sandia, LLC (NTESS). The copyright statements need to be updated
accordingly.
2017-09-20 15:33:44 -06:00
Abhishek Yenpure
7ce3d72dd1 Merge branch 'master' of https://gitlab.kitware.com/vtk/vtk-m into fix_advection_error 2017-09-14 14:50:27 -04:00
Abhishek Yenpure
1f3f10c0b6 Moving memory allocations/initializations to a single location 2017-09-14 11:16:29 -04:00
Yenpure
cfb7e7b418 Particle advection changing method inputs 2017-09-10 21:36:08 -04:00
Yenpure
51ae5a0cb6 Additional changes for proper particle advection 2017-09-08 15:50:55 -04:00
Yenpure
fca79d21ba Error fixes for particle advection filter 2017-09-08 13:20:43 -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
Dave Pugmire
611c5c43e5 Remove dead code. Remove compiler warnings. 2017-08-28 14:31: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
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
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
Yenpure
e99567fe16 Fixing template errors for particle advection 2017-08-04 14:07:40 -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
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
a3938245d2 Particle Advection Enhancements
-Added support for short steps with a generic way to support for al
 types of integrators
-Added a base class for all integrators to leverage the generic
 way to handle taking steps and push particle out of spatial domain
2017-08-01 14:55:49 -04:00
Yenpure
12d8705796 Fixing inheritance related issues in Integrators 2017-07-31 16:58:36 -04:00
Yenpure
61c61ee93b Adding a base class for Integrators 2017-07-31 15:46:13 -04:00
ayenpure
191888e010 Adding a base class for Integrators 2017-07-31 08:18:30 -04:00
Yenpure
4afb72926c Fix: return same position for particle already out of bounds 2017-07-28 15:36:23 -04:00
Abhishek Yenpure
a72bdf5463 Fix to skip input particles already out of bounds 2017-07-28 11:54:14 -04:00
Dave Pugmire
6a480bad65 Fix compiler warnings. Add ArrayHandle method for getting cell id 2017-07-27 10:10:43 -04:00
Yenpure
c5e2ee97fe particle advection enhancements
-Adding support to specify steps already taken by each particle
 to begin particle advection.
2017-07-26 16:35:43 -04:00
Dave Pugmire
79cdd5f754 Fix compiler warning. 2017-07-26 15:44:11 -04:00
Dave Pugmire
17fb9aebaf Fix compiler warning. 2017-07-26 15:41:15 -04:00
Yenpure
385d4045e9 Short step changes for particle advection
-Added preliminary code to test particles are pushed out
 of bounds
-related changes to support the feature
2017-07-26 11:03:30 -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
Yenpure
285e7fdb94 Changing return type of a succesful step
-Returning a status instead of a boolean to support more
 intricate cases.
2017-07-25 16:57:39 -04: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
Dave Pugmire
674d314da2 Fix compile error. 2017-07-24 08:16:33 -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
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
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
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
50dbd6347a Remove unneeded template from grid eval glasses. 2017-07-12 08:38:32 -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
Dave Pugmire
b86ca21b6d Cleanup for merge.
Renamed filter classes to worklet.
Removed some dead code.
2017-07-08 15:54:44 -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
Dave Pugmire
d956f000e4 Enhanced PICS filter and added BOV reader.
Add a particle advection test program for doing studies using BOV files.
Added state recording particles
Cleanup in the filter.
2017-07-07 13:43:58 -04:00
Dave Pugmire
98f2eaeb4a Refactoring particle advection filter.
Move the PICS code into the particleadvection directory.
Break the functionality out into several different header files.
2017-07-07 13:43:24 -04:00