Homec4science

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 25 2016, 01:31.

Description

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS7f4c5276775f: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 25 2016, 01:31

Merged Changes

CommitAuthorDetailsCommitted
05a1d98c042cAxel Kohlmeyer
only allow fix adapt to control 2-d parameter arrays for pair parameters 
Jan 25 2016
c3d483916547Axel Kohlmeyer
Merge branch 'lammps-icms' into kim-fix-adapt-changes 
Jan 25 2016
611bb37724baAxel Kohlmeyer
import changes to fix adapt posted by ryan elliot to lammps-users 
Jan 22 2016