Merge branch 'lammps-icms' into lammps-colvars
909e69ffd18e
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 25 2012, 21:33.

Description

Merge branch 'lammps-icms' into lammps-colvars

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 25 2012, 21:33

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS909e69ffd18e: Merge branch 'lammps-icms' into lammps-colvars (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 25 2012, 21:33

Commit	Author	Details	Committed
f2022538e67e	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Mar 25 2012
268a29a99a89	athomps	ffield.reax made identical to ffield.reax.rdx	Mar 24 2012
df3684bc83fb	athomps	ffield.reax made identical to ffield.reax.rdx	Mar 24 2012
238ab997362a	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7974 f3b2605a-c512-4ea7…	Mar 23 2012
243138906d6f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7971 f3b2605a-c512-4ea7…	Mar 22 2012
3d560301f48c	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7968 f3b2605a-c512-4ea7…	Mar 21 2012
88039f3e0866	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7967 f3b2605a-c512-4ea7…	Mar 21 2012
9a342a3258fe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7965 f3b2605a-c512-4ea7…	Mar 21 2012
55fbe648f1fb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7964 f3b2605a-c512-4ea7…	Mar 21 2012

				Path
	M			examples/reax/README
	P			examples/reax/control.reax_c.rdx Copied from examples/reax/RDX/lmp_control
	P			examples/reax/control.reax_c.tatb Copied from examples/reax/Au_O/lmp_control
	P			examples/reax/ffield.reax Copied from examples/reax/RDX/ffield.reax.rdx
	M			examples/reax/in.reax.rdx
	M			examples/reax/in.reax.tatb
	M			examples/reax/in.reaxc.rdx
	M			examples/reax/in.reaxc.tatb
	M			potentials/README.reax
	P			potentials/ffield.reax Copied from examples/reax/RDX/ffield.reax.rdx
	M			src/KSPACE/ewald.cpp
	M			src/MAKE/Makefile.redsky
	M			src/USER-EWALDN/ewald_n.cpp
	M			src/USER-REAXC/reaxc_bond_orders.cpp
	M			src/compute_group_group.cpp
	M			src/dump_dcd.cpp
	M			src/pair.cpp
	M			src/pair.h
	M			src/version.h