Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
src/KSPACE/pair_lj_cut_tip4p_long.cpp
src/KSPACE/pppm.cpp
src/molecule.cpp
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Aug 8 2014, 17:26 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS1ff3afc54c4e: Fixed double-counting of bonds and dihedrals for self-bonded atoms
rLAMMPScb8a838a6314: remove changes left behind from GLE merge - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 1ff3afc54c4e | athomps | Fixed double-counting of bonds and dihedrals for self-bonded atoms | Aug 7 2014 | |||
| 9947eb748f3b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12281 f3b2605a-c512-4ea7… | Aug 7 2014 | |||
| 1541a02bc6b7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12276 f3b2605a-c512-4ea7… | Aug 7 2014 | |||
| a049550eed6b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12275 f3b2605a-c512-4ea7… | Aug 7 2014 | |||
| 3f3446e8dded | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12274 f3b2605a-c512-4ea7… | Aug 7 2014 |