Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Sep 18 2013, 12:13 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS32b1393bed0c: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10802 f3b2605a-c512-4ea7…
rLAMMPS4a756ed4539a: bugfix for compute pe/atom w/o a kspace defined - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 32b1393bed0c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10802 f3b2605a-c512-4ea7… | Sep 17 2013 | |||
| db8e27f9f057 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10801 f3b2605a-c512-4ea7… | Sep 17 2013 | |||
| 8b67eba1359b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10800 f3b2605a-c512-4ea7… | Sep 17 2013 | |||
| c0740054e2fb | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10799 f3b2605a-c512-4ea7… | Sep 17 2013 | |||
| d11d8a4acb0f | athomps | Extended to cover all units styles | Sep 17 2013 | |||
| c659473d2558 | athomps | Added equation for ZBL | Sep 17 2013 | |||
| 82dd59c831a5 | athomps | Added equation for ZBL | Sep 17 2013 | |||
| 7b77eff37eb3 | athomps | Added equation for ZBL | Sep 17 2013 | |||
| fe7ae37d52fa | athomps | Switched econv to use qqr2e | Sep 17 2013 | |||
| bc74253621bd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10793 f3b2605a-c512-4ea7… | Sep 17 2013 |
