Diffusion lammps 222322ed1b98

Merge branch 'master' into lammps-icms
222322ed1b98
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 26 2013, 14:26.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 26 2013, 14:26

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSe6164d65f234: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9344 f3b2605a-c512-4ea7…
rLAMMPSc7a34efd4b15: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS222322ed1b98: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 26 2013, 14:26

Merged Changes

Commit	Author	Details	Committed
e6164d65f234	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9344 f3b2605a-c512-4ea7…	Jan 26 2013
d5de73bf9871	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9343 f3b2605a-c512-4ea7…	Jan 26 2013
e1c13c52caaa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9342 f3b2605a-c512-4ea7…	Jan 26 2013
69c744cb037b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9340 f3b2605a-c512-4ea7…	Jan 25 2013
61035d81382a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9339 f3b2605a-c512-4ea7…	Jan 25 2013
e635e5c0bbd1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9338 f3b2605a-c512-4ea7…	Jan 25 2013
b0d1ee5c81e1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9336 f3b2605a-c512-4ea7…	Jan 25 2013
a746399e0206	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9335 f3b2605a-c512-4ea7…	Jan 25 2013
7a1238eef4e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9334 f3b2605a-c512-4ea7…	Jan 25 2013
c799bb03d545	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9333 f3b2605a-c512-4ea7…	Jan 25 2013
807f72a6b076	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9332 f3b2605a-c512-4ea7…	Jan 25 2013
19a0bc490e3b	athomps	Updated ReaxFF ZnO citation	Jan 25 2013
c8086bffe622	athomps	Updated ReaxFF ZnO citation	Jan 25 2013
298f8732e9c5	athomps	Updated ReaxFF ZnO citation	Jan 25 2013
6bb2e13a5845	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9326 f3b2605a-c512-4ea7…	Jan 25 2013
3d5cc59bc650	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9325 f3b2605a-c512-4ea7…	Jan 25 2013
6de4a1381a42	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9324 f3b2605a-c512-4ea7…	Jan 25 2013
e55477249963	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9322 f3b2605a-c512-4ea7…	Jan 25 2013
8a00b0e000e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9321 f3b2605a-c512-4ea7…	Jan 25 2013
512ceda1f928	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9320 f3b2605a-c512-4ea7…	Jan 25 2013
4ce0dc4a7f50	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9317 f3b2605a-c512-4ea7…	Jan 25 2013
e3cd8655875f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9316 f3b2605a-c512-4ea7…	Jan 25 2013
4b2e3298b36a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9314 f3b2605a-c512-4ea7…	Jan 24 2013
97fe7ba73502	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9313 f3b2605a-c512-4ea7…	Jan 24 2013
a4bc5aa73a55	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9312 f3b2605a-c512-4ea7…	Jan 24 2013

Changes (34)

		Path
M		doc/Manual.html
M		doc/Manual.pdf
M		doc/Manual.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/compute.html
M		doc/compute.txt
A		doc/compute_voronoi_atom.html
A		doc/compute_voronoi_atom.txt
M		doc/pair_hbond_dreiding.html
M		doc/pair_hbond_dreiding.txt
M		doc/read_data.html
M		doc/read_data.txt
M		examples/reax/README
M		examples/reax/Zn_O_H/ffield.reax.ZnOH
M		potentials/README.reax
M		potentials/ffield.reax.ZnOH
M		src/FLD/pair_brownian.cpp
M		src/FLD/pair_brownian_poly.cpp
M		src/FLD/pair_lubricate.cpp
M		src/FLD/pair_lubricateU.cpp
M		src/FLD/pair_lubricateU_poly.cpp
M		src/FLD/pair_lubricate_poly.cpp
M		src/Makefile
M		src/USER-COLVARS/Install.sh
A	(dir)	src/VORONOI/
A		src/VORONOI/Install.sh
A		src/VORONOI/Makefile.lammps
A		src/VORONOI/README
A		src/VORONOI/compute_voronoi_atom.cpp
P		src/VORONOI/compute_voronoi_atom.h Copied from src/compute_ke_atom.h
M		src/fix_langevin.cpp
M		src/fix_wall.cpp
M		src/version.h