Merge branch 'master' into ak-fix
4b004ff15556
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 31 2011, 16:14.

Description

Merge branch 'master' into ak-fix

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 31 2011, 16:14

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS4b004ff15556: Merge branch 'master' into ak-fix (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 31 2011, 16:14

Commit	Author	Details	Committed
4f41208c12c0	athomps	Added reference to Ravelo et al.	Aug 31 2011
183f1b753d16	athomps	Fixed problem with static const	Aug 30 2011
c54dc5a50315	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6864 f3b2605a-c512-4ea7…	Aug 30 2011
8ab38ece5a5f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6863 f3b2605a-c512-4ea7…	Aug 30 2011
a925734a2bf0	athomps	Fixed problem with static const	Aug 30 2011
2ac7e59bf7a5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6861 f3b2605a-c512-4ea7…	Aug 30 2011
0833cc514501	athomps	Added equation for lj_cubic	Aug 30 2011
7d6d7628c1a1	athomps	Added equation for lj_cubic	Aug 30 2011
33b919a5b64d	athomps	Added equation for lj_cubic	Aug 30 2011
688c433eb998	athomps	Added pair_style lj/cubic	Aug 29 2011
5e2892aaccef	athomps	Added pair_style lj/cubic	Aug 29 2011
92ab39a01a4a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6852 f3b2605a-c512-4ea7…	Aug 29 2011

				Path
	A			doc/Eqs/pair_lj_cubic.jpg
	A			doc/Eqs/pair_lj_cubic.tex
	A			doc/pair_lj_cubic.html
	A			doc/pair_lj_cubic.txt
	M			src/dump_image.cpp
	M			src/fix_ave_spatial.cpp
	P			src/pair_lj_cubic.cpp Copied from src/USER-MISC/pair_lj_sf.cpp
	P			src/pair_lj_cubic.h Copied from src/CLASS2/pair_lj_class2.h