Diffusion lammps 689c26fa0e22

Merge branch 'master' into lammps-icms
689c26fa0e22
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 1 2012, 15:12.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 1 2012, 15:12

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS385e3c657647: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7635 f3b2605a-c512-4ea7…
rLAMMPS110e883827c5: correct support for coarse grain angle potentials.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS689c26fa0e22: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 1 2012, 15:12

Merged Changes

Commit	Author	Details	Committed
385e3c657647	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7635 f3b2605a-c512-4ea7…	Feb 1 2012
ee17d01a2041	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7633 f3b2605a-c512-4ea7…	Feb 1 2012
74ad43e245bc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7632 f3b2605a-c512-4ea7…	Feb 1 2012
915cd9188ee0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7631 f3b2605a-c512-4ea7…	Feb 1 2012
2e514cd51318	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7630 f3b2605a-c512-4ea7…	Feb 1 2012
774c2873ae70	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7627 f3b2605a-c512-4ea7…	Jan 31 2012
d39edd80b8d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7626 f3b2605a-c512-4ea7…	Jan 31 2012
f1623a496275	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7625 f3b2605a-c512-4ea7…	Jan 31 2012
3affc90781af	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7624 f3b2605a-c512-4ea7…	Jan 31 2012
7a72978db63b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7623 f3b2605a-c512-4ea7…	Jan 31 2012
45e0a2070cc3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7622 f3b2605a-c512-4ea7…	Jan 31 2012
4017a491c122	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7621 f3b2605a-c512-4ea7…	Jan 31 2012
89ba8f469dc2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7620 f3b2605a-c512-4ea7…	Jan 31 2012
26b74167bfac	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7619 f3b2605a-c512-4ea7…	Jan 31 2012

Changes (31)

				Path
	M			doc/Section_intro.html
	M			doc/Section_intro.txt
	M			doc/Section_packages.html
	M			doc/Section_packages.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/fix_deform.html
	M			doc/fix_deform.txt
	M			doc/pair_hybrid.html
	M			doc/pair_hybrid.txt
	M			doc/pair_kim.html
	M			doc/pair_kim.txt
	D			examples/kim/Cu_u3.eam
	D			examples/kim/in.kim.eam
	D			examples/kim/in.kim.eam.lmp
	M			examples/kim/in.kim.lj
	M			examples/kim/in.kim.lj.lmp
	A			examples/kim/log.kim.lj.9Jan12.linux.1
	A			examples/kim/log.kim.lj.9Jan12.linux.4
	A			examples/kim/log.kim.lj.lmp.9Jan12.linux.1
	A			examples/kim/log.kim.lj.lmp.9Jan12.linux.4
	M			src/KIM/pair_kim.cpp
	M			src/KIM/pair_kim.h
	M			src/fix_deform.cpp
	M			src/fix_deform.h
	M			src/fix_indent.cpp
	M			src/force.cpp
	M			src/pair_hybrid.cpp
	M			src/pair_hybrid.h
	M			src/pair_hybrid_overlay.cpp
	M			src/version.h