Diffusion lammps 086522264fc9

Merge branch 'lammps-icms' into cle-orig
086522264fc9
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 22 2014, 00:46.

Description

Merge branch 'lammps-icms' into cle-orig

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 22 2014, 00:46

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS68859c01915a: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
rLAMMPS934347e56584: Merge branch 'lammps-icms' into cle-orig

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS086522264fc9: Merge branch 'lammps-icms' into cle-orig (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 22 2014, 00:46

Merged Changes

Commit	Author	Details	Committed
68859c01915a	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jul 22 2014
b2cb1b35728a	Axel Kohlmeyer	enable storing custom per atom properties in fix store/state	Jul 22 2014
70a5d02c8db3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12185 f3b2605a-c512-4ea7…	Jul 14 2014
11c32cb8d488	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jul 14 2014
164832591d0d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12183 f3b2605a-c512-4ea7…	Jul 12 2014
331fe9b10bff	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12182 f3b2605a-c512-4ea7…	Jul 12 2014
0d4c0446b79f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12181 f3b2605a-c512-4ea7…	Jul 12 2014
94007ab875ae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12180 f3b2605a-c512-4ea7…	Jul 12 2014
97bbff4614c5	Axel Kohlmeyer	update htmldoc input for change in communication commands	Jul 11 2014
d1d077924fea	Axel Kohlmeyer	replace non-ASCII characters with non-accented versions	Jul 11 2014
8e9c910d8c28	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jul 11 2014
f89510ab8816	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12179 f3b2605a-c512-4ea7…	Jul 11 2014
0d6a8c5e678b	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12178 f3b2605a-c512-4ea7…	Jul 10 2014
7e875a1ef355	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12177 f3b2605a-c512-4ea7…	Jul 10 2014
33186b6ad4e2	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12176 f3b2605a-c512-4ea7…	Jul 10 2014
b69c0f4ac5c3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12174 f3b2605a-c512-4ea7…	Jul 9 2014
1ed2f052c7dc	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jul 8 2014
3b9563910ef8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12173 f3b2605a-c512-4ea7…	Jul 7 2014
5490ec615ddb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12172 f3b2605a-c512-4ea7…	Jul 7 2014
1c6cac8ae570	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jul 7 2014
ff01a109a186	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12171 f3b2605a-c512-4ea7…	Jul 3 2014
a4edae13aeda	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12170 f3b2605a-c512-4ea7…	Jul 3 2014
b5d89cd7689e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12169 f3b2605a-c512-4ea7…	Jul 2 2014
0553f4af2b94	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12168 f3b2605a-c512-4ea7…	Jul 2 2014

Changes (24)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_modify.html
	M			doc/Section_modify.txt
	M			doc/Section_packages.txt
	M			doc/Section_tools.txt
	M			doc/fix_bond_swap.html
	M			doc/fix_bond_swap.txt
	M			doc/fix_gcmc.html
	M			doc/fix_gcmc.txt
	M			doc/fix_wall_piston.html
	M			doc/fix_wall_piston.txt
	M			doc/units.html
	M			doc/units.txt
	M			lammps.book
	A			potentials/CuNi.eam.alloy
	M			python/README
	M			src/MC/fix_gcmc.cpp
	M			src/SHOCK/fix_wall_piston.cpp
	M			src/fix_gravity.cpp
	M			src/fix_store_state.cpp
	M			src/molecule.cpp
	M			src/version.h
	M			tools/python/README