Merge branch 'master' into USER-DPD_kokkos as of patch 20 Jan 2017.
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Jan 20 2017, 22:43 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS0887ff127337: Merge pull request #13 from timattox/master
rLAMMPScaea8973a3ba: add neighbor list kind output to screen - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| caea8973a3ba | Steve Plimpton | add neighbor list kind output to screen | Jan 20 2017 | |||
| aa0ad9b4835e | sjplimp/GitHub | Merge pull request #349 from akohlmey/collected-small-fixes | Jan 20 2017 | |||
| 5d0e4e1ba971 | sjplimp/GitHub | Merge pull request #346 from stanmoore1/kokkos_fixes | Jan 20 2017 | |||
| f8d3c4c7403d | sjplimp/GitHub | Merge pull request #345 from timattox/USER-DPD_another_zero_compute | Jan 20 2017 | |||
| e6996121d1c1 | Axel Kohlmeyer | remove dead code | Jan 20 2017 | |||
| fbfb1df5eb11 | Axel Kohlmeyer | fix typo causing wrong neighbor list copy selections | Jan 20 2017 | |||
| fc94f1bd18ef | Stan Moore | Fixing GPU memory issues in Kokkos | Jan 19 2017 | |||
| 5ce8e2fbaea3 | Stan Moore | Fixing GPU memory issue in modify_kokkos, need to cherry pick back to Master | Jan 19 2017 | |||
| f6cd98636b8b | Tim Mattox | USER-DPD: Also apply "check if a0 is zero" optimization to pair_dpd_fdt This… | Jan 18 2017 | |||
| 05cafb716fcb | Tim Mattox | USER-DPD: cleanup initialization of splitFDT_flag in pair_dpd_fdt.cpp | Jan 18 2017 |