Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
- Resolved Conflicts:
- doc/Manual.html
- doc/Manual.txt
- src/compute_rdf.cpp
- src/compute_rdf.h
- src/info.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Oct 6 2015, 13:35 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSda1e4e4f258c: Added elastic constant example at finite temperature
rLAMMPS7efb97e033bd: avoid leaking a file pointer when out keyword is given multiple times - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| da1e4e4f258c | athomps | Added elastic constant example at finite temperature | Oct 5 2015 | |||
| 233eaea97d7c | athomps | Added elastic constant example at finite temperature | Oct 5 2015 | |||
| ae2a7e2ebdba | athomps | Made output prettier | Oct 5 2015 | |||
| a1149efbfa3b | athomps | Added elastic constant example at finite temperature | Oct 5 2015 | |||
| 8a024fa64b01 | athomps | Added elastic constant example at finite temperature | Oct 5 2015 | |||
| db4d01260bda | athomps | Added elastic constant example at finite temperature | Oct 5 2015 | |||
| 46545bb3083b | athomps | Added elastic constant example at finite temperature | Oct 5 2015 | |||
| eda7896364bb | athomps | Added elastic constant example at finite temperature | Oct 5 2015 | |||
| f343a9f4a077 | athomps | Added elastic constant example at finite temperature | Oct 5 2015 | |||
| 1bb4a26214c3 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14095 f3b2605a-c512-4ea7… | Oct 5 2015 | |||
| bb48e4789521 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14094 f3b2605a-c512-4ea7… | Oct 5 2015 | |||
| c7842922980b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14093 f3b2605a-c512-4ea7… | Oct 5 2015 | |||
| 5fa97f537abd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14092 f3b2605a-c512-4ea7… | Oct 5 2015 | |||
| fa6ad89b99ab | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14091 f3b2605a-c512-4ea7… | Oct 5 2015 | |||
| bee7ed920a2c | sjplimp | '' | Oct 5 2015 | |||
| 0e398e5e65e4 | sjplimp | '' | Oct 5 2015 | |||
| 56ee1b670b3b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14088 f3b2605a-c512-4ea7… | Oct 5 2015 | |||
| 6f038ab6d04d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14087 f3b2605a-c512-4ea7… | Oct 5 2015 | |||
| 3f3165af39fd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14086 f3b2605a-c512-4ea7… | Oct 2 2015 | |||
| e5514189ba45 | athomps | Fixed negligible error in Tersoff and COMB | Oct 1 2015 | |||
| 858eed24383c | sjplimp | '' | Sep 28 2015 | |||
| 89ea1e4ae6d8 | sjplimp | '' | Sep 28 2015 | |||
| a6d7932ef46a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14082 f3b2605a-c512-4ea7… | Sep 28 2015 | |||
| 4d4d56175a68 | sjplimp | '' | Sep 28 2015 | |||
| 615657899c78 | sjplimp | '' | Sep 28 2015 | |||
| 4f4ba3f7bf3e | stamoor | Tweak to Kokkos Cuda Makefile allowing it to automatically find the nvcc wrapper | Sep 25 2015 |