Homec4science

Merge branch 'master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 17 2012, 00:40.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/USER-EWALDN/ewald_n.cpp
src/USER-EWALDN/ewald_n.h

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2cc12342c485: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 17 2012, 00:40

Merged Changes

CommitAuthorDetailsCommitted
0a3d08162928pscrozi
Added code to USER-EWALD/N to do rms force error estimates for long-range LJ… 
Mar 15 2012
c77e1f42e0basjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7944 f3b2605a-c512-4ea7… 
Mar 14 2012
b56da63d28f6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7932 f3b2605a-c512-4ea7… 
Mar 9 2012
1fa9603844b0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7931 f3b2605a-c512-4ea7… 
Mar 9 2012