Diffusion lammps dfa37115f0e3

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 14 2015, 22:16.

Description

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

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 14 2015, 22:16

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS77f87a6d1b0f: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13114 f3b2605a-c512-4ea7…
rLAMMPSced4019b1285: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSdfa37115f0e3: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 14 2015, 22:16

Merged Changes

Commit	Author	Details	Committed
77f87a6d1b0f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13114 f3b2605a-c512-4ea7…	Feb 14 2015
20032cd0a7f7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13113 f3b2605a-c512-4ea7…	Feb 13 2015
9312336d24c5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13112 f3b2605a-c512-4ea7…	Feb 13 2015
0b86f845888b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13111 f3b2605a-c512-4ea7…	Feb 13 2015
195cbef33a0e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13109 f3b2605a-c512-4ea7…	Feb 13 2015
49aeb04d53a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13108 f3b2605a-c512-4ea7…	Feb 13 2015
d4b9e68d1b30	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13107 f3b2605a-c512-4ea7…	Feb 13 2015
f28b0794cea2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13104 f3b2605a-c512-4ea7…	Feb 13 2015
b8541b66bad0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13103 f3b2605a-c512-4ea7…	Feb 13 2015
dfc6073e7ac5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13102 f3b2605a-c512-4ea7…	Feb 13 2015
db215ba24220	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13101 f3b2605a-c512-4ea7…	Feb 13 2015
85bae27407b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13100 f3b2605a-c512-4ea7…	Feb 13 2015
8f818715f467	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13098 f3b2605a-c512-4ea7…	Feb 13 2015
4682db87f2cc	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13097 f3b2605a-c512-4ea7…	Feb 13 2015

Changes (87)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_errors.html
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/compute.html
	M			doc/compute.txt
	D			doc/compute_atom_molecule.html
	D			doc/compute_atom_molecule.txt
	A			doc/compute_chunk_atom.html
	A			doc/compute_chunk_atom.txt
	A			doc/compute_com_chunk.html
	A			doc/compute_com_chunk.txt
	D			doc/compute_com_molecule.html
	D			doc/compute_com_molecule.txt
	A			doc/compute_gyration_chunk.html
	A			doc/compute_gyration_chunk.txt
	D			doc/compute_gyration_molecule.html
	D			doc/compute_gyration_molecule.txt
	A			doc/compute_inertia_chunk.html
	A			doc/compute_inertia_chunk.txt
	D			doc/compute_inertia_molecule.html
	D			doc/compute_inertia_molecule.txt
	A			doc/compute_msd_chunk.html
	A			doc/compute_msd_chunk.txt
	D			doc/compute_msd_molecule.html
	D			doc/compute_msd_molecule.txt
	A			doc/compute_property_chunk.html
	A			doc/compute_property_chunk.txt
	D			doc/compute_property_molecule.html
	D			doc/compute_property_molecule.txt
	A			doc/compute_temp_chunk.html
	A			doc/compute_temp_chunk.txt
	A			doc/compute_torque_chunk.html
	A			doc/compute_torque_chunk.txt
	A			doc/compute_vcm_chunk.html
	A			doc/compute_vcm_chunk.txt
	D			doc/compute_vcm_molecule.html
	D			doc/compute_vcm_molecule.txt
	A			doc/fix_ave_chunk.html
	A			doc/fix_ave_chunk.txt
	M			doc/fix_ave_spatial.html
	M			doc/fix_ave_spatial.txt
	M			doc/kspace_modify.html
	M			doc/kspace_style.html
	M			src/MC/fix_gcmc.cpp
	M			src/compute.cpp
	M			src/compute.h
	D			src/compute_atom_molecule.cpp
	D			src/compute_atom_molecule.h
	A			src/compute_chunk_atom.cpp
	A			src/compute_chunk_atom.h
	A			src/compute_com_chunk.cpp
	P			src/compute_com_chunk.h Copied from src/compute_com_molecule.h
	D			src/compute_com_molecule.cpp
	P			src/compute_com_molecule.h Deleted after being copied to multiple locations: src/compute_com_chunk.h src/compute_temp_chunk.h
	A			src/compute_gyration_chunk.cpp
	V			src/{compute_gyration_chunk.h ← compute_gyration_molecule.h}
	D			src/compute_gyration_molecule.cpp
	V			src/{compute_gyration_molecule.h → compute_gyration_chunk.h}
	A			src/compute_inertia_chunk.cpp
	P			src/compute_inertia_chunk.h Copied from src/compute_inertia_molecule.h
	D			src/compute_inertia_molecule.cpp
	P			src/compute_inertia_molecule.h Deleted after being copied to multiple locations: src/compute_inertia_chunk.h src/compute_torque_chunk.h
	A			src/compute_msd_chunk.cpp
	V			src/{compute_msd_chunk.h ← compute_msd_molecule.h}
	D			src/compute_msd_molecule.cpp
	V			src/{compute_msd_molecule.h → compute_msd_chunk.h}
	A			src/compute_property_chunk.cpp
	V			src/{compute_property_chunk.h ← compute_property_molecule.h}
	D			src/compute_property_molecule.cpp
	V			src/{compute_property_molecule.h → compute_property_chunk.h}
	A			src/compute_temp_chunk.cpp
	V			src/{compute_temp_chunk.h ← compute_com_molecule.h}
	A			src/compute_torque_chunk.cpp
	V			src/{compute_torque_chunk.h ← compute_inertia_molecule.h}
	A			src/compute_vcm_chunk.cpp
	V			src/{compute_vcm_chunk.h ← compute_vcm_molecule.h}
	D			src/compute_vcm_molecule.cpp
	V			src/{compute_vcm_molecule.h → compute_vcm_chunk.h}
	A			src/fix_ave_chunk.cpp
	A			src/fix_ave_chunk.h
	M			src/fix_ave_spatial.cpp
	M			src/fix_langevin.cpp
	M			src/version.h