Diffusion lammps 3e07cbab43d9

Merge branch 'master' into lammps-icms
3e07cbab43d9
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 3 2010, 19:15.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 3 2010, 19:15

Pushed

junge

Oct 6 2016, 16:49

Parents

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

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS3e07cbab43d9: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 3 2010, 19:15

Merged Changes

Commit	Author	Details	Committed
6c4095a13ec7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4682 f3b2605a-c512-4ea7…	Sep 3 2010
42996aa8cd2d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4680 f3b2605a-c512-4ea7…	Sep 3 2010
4df5a5dee043	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4679 f3b2605a-c512-4ea7…	Sep 3 2010
8b9c8ed7a9b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4677 f3b2605a-c512-4ea7…	Sep 3 2010
6db0f334a75f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4676 f3b2605a-c512-4ea7…	Sep 3 2010
e98b508167ab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4675 f3b2605a-c512-4ea7…	Sep 3 2010
fd38bcb3966c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4674 f3b2605a-c512-4ea7…	Sep 3 2010
49a964f2c50f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4672 f3b2605a-c512-4ea7…	Sep 3 2010
2b332de13643	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4671 f3b2605a-c512-4ea7…	Sep 3 2010
5e96663a6640	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4670 f3b2605a-c512-4ea7…	Sep 3 2010
0aaa9f43f76f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4669 f3b2605a-c512-4ea7…	Sep 3 2010
c527badb1abe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4668 f3b2605a-c512-4ea7…	Sep 3 2010
89b00a062c08	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4667 f3b2605a-c512-4ea7…	Sep 3 2010
e60e64342a64	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4666 f3b2605a-c512-4ea7…	Sep 3 2010
bce3ded48b31	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4665 f3b2605a-c512-4ea7…	Sep 2 2010

Changes (26)

		Path
M		doc/Section_tools.html
M		doc/Section_tools.txt
M		doc/dump.html
M		doc/dump.txt
M		examples/micelle/in.micelle
M		src/version.h
M		tools/README
M		tools/amber2lmp/amber2lammps.py
A	(dir)	tools/createatoms/
A		tools/createatoms/Manual.pdf
A		tools/createatoms/README
A		tools/createatoms/create.input
A		tools/createatoms/createAtoms.f
A		tools/createatoms/createAtoms.h
A	(dir)	tools/eam_database/
A		tools/eam_database/EAM.input
A		tools/eam_database/EAM_code
A		tools/eam_database/README
A		tools/eam_database/create.f
A	(dir)	tools/ipp/
A		tools/ipp/README
A		tools/ipp/fill_parameters_createAtoms.input
A		tools/ipp/fill_parameters_lammps.input
A		tools/ipp/ipp
A		tools/ipp/template_createAtoms.input
A		tools/ipp/template_lammps.input