Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
- Conflicts:
- doc/Manual.html
- doc/Manual.txt
- doc/read_restart.txt
- src/atom.cpp
- src/read_data.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jul 18 2015, 18:29 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS75a9c7349230: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13652 f3b2605a-c512-4ea7…
rLAMMPSf0ac0887d4d8: update r-RESPA test input to be more consistent and parallel run tolerant. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 75a9c7349230 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13652 f3b2605a-c512-4ea7… | Jul 18 2015 | |||
| 23630602c008 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13649 f3b2605a-c512-4ea7… | Jul 18 2015 | |||
| 16337014b4a5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13648 f3b2605a-c512-4ea7… | Jul 18 2015 | |||
| 680779c877b4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13647 f3b2605a-c512-4ea7… | Jul 18 2015 | |||
| af2147716060 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13646 f3b2605a-c512-4ea7… | Jul 18 2015 | |||
| 0e18dddc7da2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13645 f3b2605a-c512-4ea7… | Jul 18 2015 | |||
| 11de055c0f9d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13644 f3b2605a-c512-4ea7… | Jul 18 2015 | |||
| 1ebb654b4d67 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13643 f3b2605a-c512-4ea7… | Jul 18 2015 | |||
| 6d665f1860ee | stamoor | Fixing warning | Jul 17 2015 | |||
| d9ad60f61147 | stamoor | Slight tweak to Kokkos Phi Makefile | Jul 17 2015 | |||
| dd474fbc8af8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13640 f3b2605a-c512-4ea7… | Jul 17 2015 | |||
| f2492710d86e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13639 f3b2605a-c512-4ea7… | Jul 17 2015 | |||
| 9a1737eca086 | stamoor | Slight tweak to Kokkos pair styles to use texture cache memory | Jul 17 2015 | |||
| 0b8bad3e10f2 | stamoor | Slight tweaks to Kokkos CUDA makefile | Jul 17 2015 | |||
| 4e757218e43f | stamoor | Adding missing Kokkos file | Jul 17 2015 | |||
| c5bb85138416 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13632 f3b2605a-c512-4ea7… | Jul 17 2015 | |||
| b35f4e52db88 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13631 f3b2605a-c512-4ea7… | Jul 17 2015 | |||
| 0a4962be439d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13630 f3b2605a-c512-4ea7… | Jul 17 2015 |