Diffusion lammps 8a912603a5f0

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 12 2013, 18:44.

Description

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

Resolved Conflicts:
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 12 2013, 18:44

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS1ff629817f0d: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9645 f3b2605a-c512-4ea7…
rLAMMPS6332d404d52d: improved version of msm/omp from stan

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8a912603a5f0: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 12 2013, 18:44

Merged Changes

Commit	Author	Details	Committed
1ff629817f0d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9645 f3b2605a-c512-4ea7…	Mar 11 2013
e07d3d39db6f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9644 f3b2605a-c512-4ea7…	Mar 11 2013
3ba07ca1e613	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9641 f3b2605a-c512-4ea7…	Mar 11 2013
dd6ff4ebce90	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9640 f3b2605a-c512-4ea7…	Mar 11 2013
5d5f0f2a618b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9637 f3b2605a-c512-4ea7…	Mar 11 2013
c45b987764b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9636 f3b2605a-c512-4ea7…	Mar 11 2013
95e9b95d6715	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9635 f3b2605a-c512-4ea7…	Mar 11 2013
7bd090262db3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9634 f3b2605a-c512-4ea7…	Mar 11 2013
bacce98d040e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9633 f3b2605a-c512-4ea7…	Mar 11 2013
a920f2320475	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9632 f3b2605a-c512-4ea7…	Mar 11 2013
5ce9fbe0baf6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9626 f3b2605a-c512-4ea7…	Mar 11 2013
a1e6474af5fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9625 f3b2605a-c512-4ea7…	Mar 11 2013
afe5497421a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9624 f3b2605a-c512-4ea7…	Mar 11 2013

Changes (98)

		Path
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_accelerate.html
M		doc/Section_accelerate.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_example.html
M		doc/Section_example.txt
M		doc/Section_intro.html
M		doc/Section_intro.txt
M		doc/Section_tools.html
M		doc/Section_tools.txt
M		doc/compute_voronoi_atom.html
M		doc/compute_voronoi_atom.txt
M		doc/dump.html
M		doc/dump.txt
M		doc/fix_adapt.html
M		doc/fix_adapt.txt
A		doc/fix_phonon.html
A		doc/fix_phonon.txt
M		doc/fix_spring.html
M		doc/fix_spring.txt
M		doc/read_restart.html
M		doc/read_restart.txt
M		examples/COUPLE/lammps_spparks/README
A	(dir)	examples/USER/phonon/
A	(dir)	examples/USER/phonon/1-1D-mono/
A		examples/USER/phonon/1-1D-mono/README
A		examples/USER/phonon/1-1D-mono/data.pos
A		examples/USER/phonon/1-1D-mono/disp.dat
A		examples/USER/phonon/1-1D-mono/in.Ana
A		examples/USER/phonon/1-1D-mono/in.disp
A		examples/USER/phonon/1-1D-mono/log.lammps.example
A		examples/USER/phonon/1-1D-mono/map.in
A		examples/USER/phonon/1-1D-mono/pdisp.eps
A		examples/USER/phonon/1-1D-mono/phonon.bin.2000000
A		examples/USER/phonon/1-1D-mono/phonon.log
A		examples/USER/phonon/1-1D-mono/plot.disp
A	(dir)	examples/USER/phonon/2-1D-diatomic/
A		examples/USER/phonon/2-1D-diatomic/README
A		examples/USER/phonon/2-1D-diatomic/data.pos
A		examples/USER/phonon/2-1D-diatomic/disp.dat
A		examples/USER/phonon/2-1D-diatomic/in.Ana
A		examples/USER/phonon/2-1D-diatomic/in.disp
A		examples/USER/phonon/2-1D-diatomic/log.lammps.example
A		examples/USER/phonon/2-1D-diatomic/map.in
A		examples/USER/phonon/2-1D-diatomic/pdisp.eps
A		examples/USER/phonon/2-1D-diatomic/pdos.dat
A		examples/USER/phonon/2-1D-diatomic/phonon.bin.2000000
A		examples/USER/phonon/2-1D-diatomic/phonon.log
A		examples/USER/phonon/2-1D-diatomic/plot.disp
A	(dir)	examples/USER/phonon/3-3D-FCC-Cu-EAM/
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/CuPhonon.bin.6500000
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/CuPhonon.log.example
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/README
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/cuu3.eam
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/data.pos
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/disp-expr.dat
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/disp-ld.dat
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/disp.dat
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/dos-expr.dat
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/dos-ld.dat
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/dos.dat
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/in.EAM3D
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/in.disp
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/in.dos
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/log.lammps.example
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/map.in
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/pdisp.eps
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/pdos.eps
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/plot.disp
A		examples/USER/phonon/3-3D-FCC-Cu-EAM/plot.dos
M		python/README
M		python/lammps.py
M		src/Makefile
A	(dir)	src/USER-PHONON/
A		src/USER-PHONON/Install.sh
A		src/USER-PHONON/README
A		src/USER-PHONON/fix_phonon.cpp
A		src/USER-PHONON/fix_phonon.h
M		src/version.h
M		tools/README
A	(dir)	tools/phonon/
A		tools/phonon/Makefile
A		tools/phonon/README
A		tools/phonon/dynmat.cpp
A		tools/phonon/dynmat.h
A		tools/phonon/green.cpp
A		tools/phonon/green.h
A		tools/phonon/interpolate.cpp
A		tools/phonon/interpolate.h
A		tools/phonon/main.cpp
A		tools/phonon/memory.cpp
A		tools/phonon/memory.h
A		tools/phonon/phonon.cpp
A		tools/phonon/phonon.h
A		tools/phonon/timer.cpp
A		tools/phonon/timer.h