Homec4science

Merge branch 'merge-pull-46' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 5 2016, 02:18.

Description

Merge branch 'merge-pull-46' into lammps-icms

adding morse/soft pair style to USER-FEP.
Contributed by Stefan Paquay (TU/e)

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS5a3f2e93a050: Merge branch 'merge-pull-46' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 5 2016, 02:18

Merged Changes

CommitAuthorDetailsCommitted
48f9dd832cceAxel Kohlmeyer
add contibutor attribution to .cpp file for morse/soft 
Apr 5 2016
9137610a4fd7Axel Kohlmeyer
some cleanup and added credits to README for USER-FEP contribution 
Apr 5 2016
a6df142b8e9bAxel Kohlmeyer
Merge branch 'add-morse-soft' of https://github.com/Pakketeretet2/lammps into… 
Apr 5 2016
6ad21affd539Stefan Paquay
forgot modification of Install-script. 
Apr 4 2016
4976543b1955Stefan Paquay
Added softcore pair_morse 
Apr 4 2016