Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…
3de59dbf5839
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 4 2014, 16:00.

Description

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 4 2014, 16:00

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
96ccc7976d2b	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Feb 4 2014
b7d55ca48407	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11467 f3b2605a-c512-4ea7…	Feb 4 2014
a1b640205f2e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11466 f3b2605a-c512-4ea7…	Feb 4 2014
f474d7d106b8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11464 f3b2605a-c512-4ea7…	Feb 4 2014
fc5f92579dec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11463 f3b2605a-c512-4ea7…	Feb 4 2014
45bcc8660215	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11461 f3b2605a-c512-4ea7…	Feb 4 2014
8688b7b430e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11460 f3b2605a-c512-4ea7…	Feb 4 2014
298e177acbdd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11459 f3b2605a-c512-4ea7…	Feb 4 2014
e3979f61439e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11458 f3b2605a-c512-4ea7…	Feb 4 2014
495c5a09b32d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11457 f3b2605a-c512-4ea7…	Feb 4 2014
743cf8b837ad	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11456 f3b2605a-c512-4ea7…	Feb 4 2014
76e47e855be7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11455 f3b2605a-c512-4ea7…	Feb 4 2014
53509fac9f5f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11452 f3b2605a-c512-4ea7…	Feb 3 2014

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/compute_damage_atom.html
	M			doc/compute_damage_atom.txt
	A			doc/compute_dilatation.html
	A			doc/compute_dilatation.txt
	A			doc/compute_plasticity.html
	A			doc/compute_plasticity.txt
	M			doc/compute_vacf.html
	M			doc/compute_vacf.txt
	M			doc/fix_ave_time.html
	M			doc/fix_ave_time.txt
	A			doc/fix_vector.html
	A			doc/fix_vector.txt
	M			doc/pair_peri.html
	M			doc/pair_peri.txt
	P			src/PERI/compute_damage_atom.cpp Copied to multiple locations: src/PERI/compute_dilatation_atom.cpp src/PERI/compute_plasticity_atom.cpp
	P			src/PERI/compute_dilatation_atom.cpp Copied from src/PERI/compute_damage_atom.cpp
	P			src/PERI/compute_dilatation_atom.h Copied from src/USER-MISC/compute_basal_atom.h
	P			src/PERI/compute_plasticity_atom.cpp Copied from src/PERI/compute_damage_atom.cpp
	P			src/PERI/compute_plasticity_atom.h Copied from src/USER-SPH/compute_meso_rho_atom.h
	M			src/PERI/fix_peri_neigh.cpp
	M			src/PERI/fix_peri_neigh.h
	P			src/PERI/pair_peri_eps.cpp Copied from src/PERI/pair_peri_ves.cpp
	P			src/PERI/pair_peri_eps.h Copied from src/PERI/pair_peri_ves.h
	M			src/PERI/pair_peri_lps.cpp
	M			src/PERI/pair_peri_lps.h
	P			src/PERI/pair_peri_ves.cpp Copied to src/PERI/pair_peri_eps.cpp
	P			src/PERI/pair_peri_ves.h Copied to src/PERI/pair_peri_eps.h
	M			src/fix_ave_time.cpp
	A			src/fix_vector.cpp
	P			src/fix_vector.h Copied from src/fix_ave_time.h
	M			src/version.h