Merge branch 'lammps-icms' into lammps-molfile
dba8ef573f6f
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 9 2012, 15:21.

Description

Merge branch 'lammps-icms' into lammps-molfile

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 9 2012, 15:21

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSdba8ef573f6f: Merge branch 'lammps-icms' into lammps-molfile (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 9 2012, 15:21

Commit	Author	Details	Committed
7b24064a70d5	Axel Kohlmeyer	imported bugfix by andrew jewett	May 9 2012
3c8cacdebec9	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	May 9 2012
b1284262b88f	athomps	Fixed problem with cutof3	May 8 2012
a1f265d13974	Axel Kohlmeyer	fix typos	May 8 2012
3eb62a4c5af1	athomps	Added fix reax/c/bonds	May 8 2012
ba52ecd66ee1	athomps	Added fix reax/c/bonds	May 8 2012
585eaa3bee7f	athomps	Added fix reax/c/bonds	May 8 2012
76b4aec8e50c	athomps	Fixed reax per-atom energy and virial at periodic boundary	May 7 2012
819fcd6bb825	athomps	Added space to FullNghs output	May 7 2012
dd1c08433fb3	Axel Kohlmeyer	updated README file for fortran coupling	May 7 2012

				Path
	M			couple/simple/README
	M			doc/compute_atom_molecule.txt
	M			doc/compute_reduce.txt
	M			doc/compute_slice.txt
	M			doc/fix_ave_spatial.txt
	A			doc/fix_reaxc_bonds.html
	A			doc/fix_reaxc_bonds.txt
	M			examples/reax/in.reaxc.tatb
	M			src/REAX/fix_reax_bonds.cpp
	M			src/USER-MISC/dihedral_table.cpp
	M			src/USER-MISC/dihedral_table.h
	M			src/USER-REAXC/fix_reaxc_bonds.cpp
	M			src/USER-REAXC/fix_reaxc_bonds.h
	M			src/USER-REAXC/reaxc_bond_orders.cpp
	M			src/finish.cpp
	M			src/pair.cpp
	M			src/pair.h