Diffusion lammps 75cd0d145186

Merge branch 'master' into ak-fix
75cd0d145186
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 24 2011, 19:42.

Description

Merge branch 'master' into ak-fix

Conflicts:
doc/pair_coul.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 24 2011, 19:42

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSbdc60fba0e40: also make the table option a template value.
rLAMMPS816f984ec7c0: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6779 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS75cd0d145186: Merge branch 'master' into ak-fix (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 24 2011, 19:42

Merged Changes

Commit	Author	Details	Committed
816f984ec7c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6779 f3b2605a-c512-4ea7…	Aug 24 2011
9b2cc1490956	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6778 f3b2605a-c512-4ea7…	Aug 24 2011
ac4e426f25ad	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6776 f3b2605a-c512-4ea7…	Aug 24 2011
97243b694334	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6775 f3b2605a-c512-4ea7…	Aug 24 2011
bbf48376e2e4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6773 f3b2605a-c512-4ea7…	Aug 24 2011
6ac01bf0d4e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6772 f3b2605a-c512-4ea7…	Aug 24 2011
a3c3214428cf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6769 f3b2605a-c512-4ea7…	Aug 23 2011
5414a66be0cd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6768 f3b2605a-c512-4ea7…	Aug 23 2011
e77ec4dea6c9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6767 f3b2605a-c512-4ea7…	Aug 23 2011
541c47f4d45d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6766 f3b2605a-c512-4ea7…	Aug 23 2011
7a1f6fc1ee18	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6765 f3b2605a-c512-4ea7…	Aug 23 2011
c120ad3313c6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6764 f3b2605a-c512-4ea7…	Aug 23 2011
a3a957195a1b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6763 f3b2605a-c512-4ea7…	Aug 23 2011
84261163c08d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6762 f3b2605a-c512-4ea7…	Aug 23 2011
89f00f3011d5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6761 f3b2605a-c512-4ea7…	Aug 23 2011
301dad125fa7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6760 f3b2605a-c512-4ea7…	Aug 23 2011
1490fa26067f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6759 f3b2605a-c512-4ea7…	Aug 23 2011
d2518f343ecf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6758 f3b2605a-c512-4ea7…	Aug 23 2011
cec03fd5ca40	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6757 f3b2605a-c512-4ea7…	Aug 23 2011
5df6dd7b53e4	athomps	Added some comments	Aug 22 2011
3f21a1aad6f6	athomps	Added NPzzHug Hugoniostat	Aug 21 2011
94fc87cf1261	athomps	Added NPzzHug Hugoniostat	Aug 21 2011

Changes (31)

				Path
	A			doc/Developers.pdf
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/Section_commands.html
	M			doc/pair_coul.html
	M			doc/pair_coul.txt
	M			lib/cuda/Makefile.lammps
	M			src/MAKE/Makefile.serial
	M			src/OPT/pair_eam_alloy_opt.cpp
	M			src/OPT/pair_eam_alloy_opt.h
	M			src/OPT/pair_eam_fs_opt.cpp
	M			src/OPT/pair_eam_fs_opt.h
	V			src/OPT/{pair_eam_opt.cpp ← pair_eam_opt.h}
	V			src/OPT/{pair_eam_opt.h → pair_eam_opt.cpp}
	V			src/OPT/{pair_lj_charmm_coul_long_opt.cpp ← pair_lj_charmm_coul_long_opt.h}
	V			src/OPT/{pair_lj_charmm_coul_long_opt.h → pair_lj_charmm_coul_long_opt.cpp}
	V			src/OPT/{pair_lj_cut_opt.cpp ← pair_lj_cut_opt.h}
	V			src/OPT/{pair_lj_cut_opt.h → pair_lj_cut_opt.cpp}
	V			src/OPT/{pair_morse_opt.cpp ← pair_morse_opt.h}
	V			src/OPT/{pair_morse_opt.h → pair_morse_opt.cpp}
	M			src/SHOCK/Install.sh
	A			src/SHOCK/fix_nphug.cpp
	P			src/SHOCK/fix_nphug.h Copied from src/REAX/fix_reax_bonds.h
	M			src/comm.cpp
	M			src/fix_nh.cpp
	M			src/fix_nh.h
	M			src/input.cpp
	M			src/lammps.cpp
	M			src/version.h