Merge branch 'merge-pull-46' into lammps-icms
adding morse/soft pair style to USER-FEP.
Contributed by Stefan Paquay (TU/e)
Axel Kohlmeyer <akohlmey@gmail.com> | Apr 5 2016, 02:18 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
48f9dd832cce | Axel Kohlmeyer | add contibutor attribution to .cpp file for morse/soft | Apr 5 2016 | |||
9137610a4fd7 | Axel Kohlmeyer | some cleanup and added credits to README for USER-FEP contribution | Apr 5 2016 | |||
a6df142b8e9b | Axel Kohlmeyer | Merge branch 'add-morse-soft' of https://github.com/Pakketeretet2/lammps into… | Apr 5 2016 | |||
6ad21affd539 | Stefan Paquay | forgot modification of Install-script. | Apr 4 2016 | |||
4976543b1955 | Stefan Paquay | Added softcore pair_morse | Apr 4 2016 |