Homec4science

Merge branch 'master' of https://www.github.com/lammps/lammps

Authored by Stefan Paquay <stefanpaquay@gmail.com> on Jun 24 2017, 01:31.

Description

Merge branch 'master' of https://www.github.com/lammps/lammps

Event Timeline

Stefan Paquay <stefanpaquay@gmail.com> committed rLAMMPS125795566234: Merge branch 'master' of https://www.github.com/lammps/lammps (authored by Stefan Paquay <stefanpaquay@gmail.com>).Jun 24 2017, 01:31

Merged Changes

CommitAuthorDetailsCommitted
1370385c8c9fSteve Plimpton
patch 23Jun17 
Jun 24 2017
2240c3d7d3a8sjplimp/GitHub
Merge pull request #548 from lammps/doc-update 
Jun 24 2017
4fcbd58d5a32Steve Plimpton
doc page clarifications for CHARMM energy and dipole pre-factors 
Jun 23 2017
25a5d12af386sjplimp/GitHub
Merge pull request #541 from lammps/charmm 
Jun 23 2017
feb500b52684Axel Kohlmeyer
reword the kspace_modify fftbench keyword docs to reflect the current state (i. 
Jun 23 2017
a714b5774132Axel Kohlmeyer
make neighbor list reset message for minimization more explicit 
Jun 23 2017
c5430b0a2607Axel Kohlmeyer
print info messages when changing qqr2e constant in fully CHARMM compatible… 
Jun 23 2017
60c3f3d64c58Steve Plimpton
use CHARMM energy conversion factor with new CHARMM pair styles 
Jun 22 2017