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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 28 2016, 15:58.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 28 2016, 15:58

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
56517813968d	Axel Kohlmeyer	convert machines "mpi" and "serial" to new dependency handling	Feb 28 2016
cb3d9a80d885	Axel Kohlmeyer	always delete and recreate .depend from master makefile.	Feb 28 2016
33a3c821d123	Axel Kohlmeyer	Integrated pair_style morse/smooth/linear from stefan paquay in USER-MISC	Feb 28 2016
53bf9f7da8de	Stefan Paquay/Axel Kohlmeyer	Added equation and description for pair_style morse/smooth/linear	Feb 28 2016
c22d699f742d	Stefan Paquay/Axel Kohlmeyer	Added a linearly smoothed variant for the Morse potential.	Feb 28 2016

				Path
	A			doc/Eqs/pair_morse_smooth_linear.jpg
	P			doc/Eqs/pair_morse_smooth_linear.tex Copied from doc/Eqs/pair_lj_smooth_linear.tex
	M			doc/pair_morse.txt
	M			src/MAKE/MINE/Makefile.openmpi-omp
	M			src/MAKE/Makefile.mpi
	M			src/MAKE/Makefile.serial
	M			src/Makefile
	M			src/USER-MISC/README
	P			src/USER-MISC/pair_morse_smooth_linear.cpp Copied from src/pair_morse.cpp
	P			src/USER-MISC/pair_morse_smooth_linear.h Copied from src/pair_morse.h