Diffusion lammps 1a516b2ab224

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
1a516b2ab224
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 13 2014, 15:01.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 13 2014, 15:01

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS32a5cd0043d6: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11558 f3b2605a-c512-4ea7…
rLAMMPS3c2f6b0ef445: white space cleanup

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1a516b2ab224: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 13 2014, 15:01

Merged Changes

Commit	Author	Details	Committed
32a5cd0043d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11558 f3b2605a-c512-4ea7…	Feb 13 2014
aed44ea997d4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11557 f3b2605a-c512-4ea7…	Feb 13 2014
52aa47f17d96	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11555 f3b2605a-c512-4ea7…	Feb 13 2014
3686cb19cf33	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11554 f3b2605a-c512-4ea7…	Feb 13 2014
553baf3f4d39	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11553 f3b2605a-c512-4ea7…	Feb 13 2014
0bd0e95bad82	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11552 f3b2605a-c512-4ea7…	Feb 13 2014
8a8636f056bb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11551 f3b2605a-c512-4ea7…	Feb 13 2014
379106966557	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11550 f3b2605a-c512-4ea7…	Feb 12 2014
75e01534775f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11549 f3b2605a-c512-4ea7…	Feb 12 2014
6b0f446cfde5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11548 f3b2605a-c512-4ea7…	Feb 12 2014
c02bc566ad23	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11547 f3b2605a-c512-4ea7…	Feb 12 2014
9a302200ab7d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11546 f3b2605a-c512-4ea7…	Feb 12 2014
a664847d83d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11545 f3b2605a-c512-4ea7…	Feb 12 2014
82d624f764c2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11544 f3b2605a-c512-4ea7…	Feb 12 2014
5b3adea360a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11543 f3b2605a-c512-4ea7…	Feb 12 2014
8c73aaed01fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11542 f3b2605a-c512-4ea7…	Feb 12 2014
9f902047ba28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11541 f3b2605a-c512-4ea7…	Feb 12 2014
ef9af34f3225	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11540 f3b2605a-c512-4ea7…	Feb 12 2014

Changes (90)

		Path
M		doc/Manual.html
M		doc/Manual.txt
A		doc/PDF/PDLammps_overview.pdf
M		doc/Section_howto.html
M		doc/Section_howto.txt
M		doc/compute_damage_atom.html
M		doc/compute_damage_atom.txt
V		doc/{compute_dilatation.html → compute_dilatation_atom.html}
V		doc/{compute_dilatation.txt → compute_dilatation_atom.txt}
V		doc/{compute_dilatation_atom.html ← compute_dilatation.html}
V		doc/{compute_dilatation_atom.txt ← compute_dilatation.txt}
V		doc/{compute_plasticity.html → compute_plasticity_atom.html}
V		doc/{compute_plasticity.txt → compute_plasticity_atom.txt}
V		doc/{compute_plasticity_atom.html ← compute_plasticity.html}
V		doc/{compute_plasticity_atom.txt ← compute_plasticity.txt}
M		doc/fix_planeforce.html
M		doc/jump.html
M		doc/jump.txt
M		doc/pair_peri.html
M		doc/pair_peri.txt
D		examples/ASPHERE/box/log.box.10Sep13
A		examples/ASPHERE/box/log.box.1Feb14
D		examples/ASPHERE/box/log.box.mp.10Sep13
A		examples/ASPHERE/box/log.box.mp.1Feb14
D		examples/ASPHERE/dimer/log.dimer.10Sep13
A		examples/ASPHERE/dimer/log.dimer.1Feb14
D		examples/ASPHERE/dimer/log.dimer.mp.10Sep13
A		examples/ASPHERE/dimer/log.dimer.mp.1Feb14
D		examples/ASPHERE/ellipsoid/log.ellipsoid.10Sep13
A		examples/ASPHERE/ellipsoid/log.ellipsoid.1Feb14
D		examples/ASPHERE/ellipsoid/log.ellipsoid.mp.10Sep13
A		examples/ASPHERE/ellipsoid/log.ellipsoid.mp.1Feb14
D		examples/ASPHERE/line/log.line.10Sep13
A		examples/ASPHERE/line/log.line.1Feb14
D		examples/ASPHERE/line/log.line.srd.10Sep13
A		examples/ASPHERE/line/log.line.srd.1Feb14
D		examples/ASPHERE/poly/log.poly.10Sep13
A		examples/ASPHERE/poly/log.poly.1Feb14
D		examples/ASPHERE/poly/log.poly.mp.10Sep13
A		examples/ASPHERE/poly/log.poly.mp.1Feb14
D		examples/ASPHERE/star/log.star.10Sep13
A		examples/ASPHERE/star/log.star.1Feb14
D		examples/ASPHERE/star/log.star.mp.10Sep13
A		examples/ASPHERE/star/log.star.mp.1Feb14
D		examples/ASPHERE/tri/log.tri.srd.10Sep13
A		examples/ASPHERE/tri/log.tri.srd.1Feb14
A	(dir)	examples/DIFFUSE/
A		examples/DIFFUSE/README
A		examples/DIFFUSE/in.msd.2d
A		examples/DIFFUSE/in.vacf.2d
A		examples/DIFFUSE/log.msd.2d.1Feb14
A		examples/DIFFUSE/log.vacf.2d.1Feb14
D		examples/KAPPA/log.heat.12Sep13
P		examples/KAPPA/log.heat.1Feb14 Copied from examples/KAPPA/log.heatflux.12Sep13
P		examples/KAPPA/log.heatflux.12Sep13 Deleted after being copied to multiple locations: examples/KAPPA/log.heat.1Feb14 examples/KAPPA/log.heatflux.1Feb14
V		examples/KAPPA/{log.heatflux.1Feb14 ← log.heatflux.12Sep13}
D		examples/KAPPA/log.langevin.12Sep13
A		examples/KAPPA/log.langevin.1Feb14
V		examples/KAPPA/{log.mp.12Sep13 → log.mp.1Feb14}
V		examples/KAPPA/{log.mp.1Feb14 ← log.mp.12Sep13}
D		examples/KAPPA/profile.heat.12Sep13
P		examples/KAPPA/profile.heat.1Feb14 Copied from examples/KAPPA/profile.heatflux.12Sep13
P		examples/KAPPA/profile.heatflux.12Sep13 Deleted after being copied to multiple locations: examples/KAPPA/profile.heat.1Feb14 examples/KAPPA/profile.heatflux.1Feb14
V		examples/KAPPA/{profile.heatflux.1Feb14 ← profile.heatflux.12Sep13}
D		examples/KAPPA/profile.langevin.12Sep13
A		examples/KAPPA/profile.langevin.1Feb14
V		examples/KAPPA/{profile.mp.12Sep13 → profile.mp.1Feb14}
V		examples/KAPPA/{profile.mp.1Feb14 ← profile.mp.12Sep13}
M		examples/VISCOSITY/in.mp.2d
M		examples/VISCOSITY/in.nemd.2d
M		examples/VISCOSITY/in.wall.2d
D		examples/VISCOSITY/log.gk.2d.12Sep13
A		examples/VISCOSITY/log.gk.2d.1Feb14
D		examples/VISCOSITY/log.mp.2d.12Sep13
A		examples/VISCOSITY/log.mp.2d.1Feb14
D		examples/VISCOSITY/log.nemd.2d.12Sep13
A		examples/VISCOSITY/log.nemd.2d.1Feb14
D		examples/VISCOSITY/log.wall.2d.12Sep13
A		examples/VISCOSITY/log.wall.2d.1Feb14
D		examples/VISCOSITY/profile.gk.2d.12Sep13
A		examples/VISCOSITY/profile.gk.2d.1Feb14
D		examples/VISCOSITY/profile.mp.2d.12Sep13
A		examples/VISCOSITY/profile.mp.2d.1Feb14
D		examples/VISCOSITY/profile.nemd.2d.12Sep13
A		examples/VISCOSITY/profile.nemd.2d.1Feb14
D		examples/VISCOSITY/profile.wall.2d.12Sep13
A		examples/VISCOSITY/profile.wall.2d.1Feb14
M		src/RIGID/compute_erotate_rigid.cpp
M		src/RIGID/compute_ke_rigid.cpp
M		src/version.h