Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/USER-EWALDN/ewald_n.cpp
src/USER-EWALDN/ewald_n.h
Axel Kohlmeyer <akohlmey@gmail.com> | Mar 17 2012, 00:40 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
0a3d08162928 | pscrozi | Added code to USER-EWALD/N to do rms force error estimates for long-range LJ… | Mar 15 2012 | |||
c77e1f42e0ba | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7944 f3b2605a-c512-4ea7… | Mar 14 2012 | |||
b56da63d28f6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7932 f3b2605a-c512-4ea7… | Mar 9 2012 | |||
1fa9603844b0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7931 f3b2605a-c512-4ea7… | Mar 9 2012 |