Merge branch 'master' into USER-DPD_kokkos
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Mar 10 2017, 22:29 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS6f71275db30f: Add Kokkos version of atom_vec_hybrid_kokkos, without CUDA support
rLAMMPS07fcfd6d54a1: Merge pull request #405 from stanmoore1/ev_setup_kk - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 07fcfd6d54a1 | sjplimp/GitHub | Merge pull request #405 from stanmoore1/ev_setup_kk | Mar 10 2017 | |||
| c97feafca6ac | sjplimp/GitHub | Merge pull request #407 from frobnitzem/master | Mar 10 2017 | |||
| b20d95d49548 | sjplimp/GitHub | Merge pull request #402 from timattox/USER-DPD_spelling | Mar 10 2017 | |||
| 65964f3b31ea | David M. Rogers | Add error check to lammps_gather_atoms/lammps_scatter_atoms in library.cpp | Mar 9 2017 | |||
| 2ef713ea1b49 | Axel Kohlmeyer | restore incorrect change due to spell checking in fix imd | Mar 8 2017 | |||
| 42d3a8f4982d | Tim Mattox | Fix spelling "correction" from 3a054d1a: iterations not interactions. :-) | Mar 7 2017 |