Merge branch 'master' into lammps-icms
73e63afa5bb8
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 28 2010, 22:09.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 28 2010, 22:09

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS73e63afa5bb8: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 28 2010, 22:09

Commit	Author	Details	Committed
59d7df535d22	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4612 f3b2605a-c512-4ea7…	Aug 28 2010
cc40d926474c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4611 f3b2605a-c512-4ea7…	Aug 28 2010
9d9620c06a52	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4610 f3b2605a-c512-4ea7…	Aug 28 2010
8431dcc356a5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4609 f3b2605a-c512-4ea7…	Aug 28 2010
95bbf0e1bec9	athomps	Tweaked handling of eflag and vflag	Aug 28 2010
7dad180e69da	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4606 f3b2605a-c512-4ea7…	Aug 27 2010
44429292a02b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4605 f3b2605a-c512-4ea7…	Aug 27 2010
74dc0a552bd2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4604 f3b2605a-c512-4ea7…	Aug 27 2010
3dfd2c26763f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4603 f3b2605a-c512-4ea7…	Aug 27 2010
4b50124424fc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4602 f3b2605a-c512-4ea7…	Aug 27 2010
55a0a3af4e5a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4601 f3b2605a-c512-4ea7…	Aug 26 2010
31f847883fec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4599 f3b2605a-c512-4ea7…	Aug 26 2010
2676e30a502b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4597 f3b2605a-c512-4ea7…	Aug 26 2010

				Path
	M			doc/compute_heat_flux.html
	M			doc/compute_heat_flux.txt
	M			doc/velocity.html
	M			doc/velocity.txt
	M			examples/couple/README
	M			examples/couple/c++_driver.cpp
	M			examples/couple/c_driver.c
	M			src/GPU/pair_gayberne_gpu.cpp
	M			src/MANYBODY/pair_airebo.cpp
	M			src/MANYBODY/pair_comb.cpp
	M			src/MANYBODY/pair_eam.cpp
	M			src/MANYBODY/pair_tersoff.cpp
	M			src/MEAM/pair_meam.cpp
	M			src/Makefile.lib
	M			src/OPT/pair_eam_opt.cpp
	M			src/PERI/pair_peri_lps.cpp
	M			src/REAX/pair_reax.cpp
	M			src/USER-CD-EAM/pair_cdeam.cpp
	M			src/compute_displace_atom.cpp
	M			src/pair_hybrid.cpp
	M			src/version.h