Merge branch 'master' into lammps-icms
605509ba56f8
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 6 2010, 22:14.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 6 2010, 22:14

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS605509ba56f8: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 6 2010, 22:14

Commit	Author	Details	Committed
f9c3f5b405a5	athomps	Added potential gradient columns	Nov 6 2010
80468a281f78	athomps	Added potential gradient columns	Nov 6 2010
6813e71251a2	athomps	Added potential gradient columns	Nov 6 2010
fb51a67f64a5	athomps	Added potential gradient columns	Nov 6 2010
0128dca0c5de	athomps	Added potential gradient columns	Nov 6 2010
6a22fc774824	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5220 f3b2605a-c512-4ea7…	Nov 5 2010
c42726b8e3dd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5218 f3b2605a-c512-4ea7…	Nov 5 2010
b511a7557563	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5217 f3b2605a-c512-4ea7…	Nov 5 2010
236cf5832809	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5216 f3b2605a-c512-4ea7…	Nov 5 2010

				Path
	A			doc/JPG/hop1.jpg
	A			doc/JPG/hop1_small.jpg
	A			doc/JPG/hop2.jpg
	A			doc/JPG/hop2_small.jpg
	M			doc/neb.html
	M			doc/neb.txt
	M			doc/pair_reax.html
	M			doc/pair_reax.txt
	M			examples/reax/in.reax.rdx
	M			examples/reax/in.reax.tatb
	M			examples/reax/in.reax_c.rdx
	M			potentials/README.reax
	M			src/REAX/pair_reax.cpp
	M			src/REAX/pair_reax.h
	M			src/REAX/pair_reax_fortran.h
	M			src/create_atoms.cpp
	M			src/min_fire.cpp
	M			src/min_quickmin.cpp
	M			src/pair_lj_gromacs.cpp
	M			src/pair_lj_gromacs_coul_gromacs.cpp
	M			src/version.h