Diffusion lammps 75b5da2abb5f

Merge branch 'master' into lammps-icms
75b5da2abb5f
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 10 2012, 21:25.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Section_commands.html
src/comm.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 10 2012, 21:25

Pushed

junge

Oct 6 2016, 16:49

Parents

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

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS75b5da2abb5f: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 10 2012, 21:25

Merged Changes

Commit	Author	Details	Committed
44f04465ec49	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7746 f3b2605a-c512-4ea7…	Feb 9 2012
16d99cc1765b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7745 f3b2605a-c512-4ea7…	Feb 9 2012
d381265fc56d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7744 f3b2605a-c512-4ea7…	Feb 9 2012
4a72d0fe71d7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7743 f3b2605a-c512-4ea7…	Feb 9 2012
d850025578b7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7741 f3b2605a-c512-4ea7…	Feb 9 2012
2f095e1349f4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7740 f3b2605a-c512-4ea7…	Feb 9 2012
cd5a636f41ab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7739 f3b2605a-c512-4ea7…	Feb 9 2012
bd17881c8bee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7737 f3b2605a-c512-4ea7…	Feb 9 2012
ded520eaccc3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7736 f3b2605a-c512-4ea7…	Feb 9 2012
585b9c5a4fc1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7735 f3b2605a-c512-4ea7…	Feb 9 2012
d892afbf67f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7734 f3b2605a-c512-4ea7…	Feb 9 2012
2ab478095eed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7733 f3b2605a-c512-4ea7…	Feb 9 2012
e04e54d0d169	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7732 f3b2605a-c512-4ea7…	Feb 9 2012
8b2ffeddaf9b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7731 f3b2605a-c512-4ea7…	Feb 9 2012
2255c513ae87	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7728 f3b2605a-c512-4ea7…	Feb 8 2012

Changes (48)

				Path
	A			doc/JPG/balance.jpg
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	A			doc/balance.html
	A			doc/balance.txt
	M			doc/change_box.html
	M			doc/change_box.txt
	M			examples/reax/CHO/in.CHO
	M			src/GPU/pair_buck_coul_cut_gpu.h
	M			src/GPU/pair_buck_coul_long_gpu.h
	M			src/GPU/pair_buck_gpu.h
	M			src/GPU/pair_eam_alloy_gpu.h
	M			src/GPU/pair_eam_fs_gpu.h
	M			src/GPU/pair_eam_gpu.h
	M			src/GPU/pair_lj_sdk_coul_long_gpu.h
	M			src/GPU/pair_lj_sdk_gpu.h
	M			src/GPU/pair_table_gpu.h
	M			src/GPU/pair_yukawa_gpu.h
	M			src/KIM/pair_kim.cpp
	M			src/KIM/pair_kim.h
	M			src/KSPACE/pppm.cpp
	M			src/WINDOWS/README.txt
	A			src/balance.cpp
	A			src/balance.h
	M			src/change_box.cpp
	M			src/change_box.h
	M			src/comm.cpp
	M			src/comm.h
	M			src/domain.cpp
	M			src/domain.h
	M			src/dump_image.h
	M			src/fix_deform.h
	M			src/image.h
	M			src/irregular.cpp
	M			src/irregular.h
	M			src/neigh_derive.h
	M			src/neigh_full.h
	M			src/neigh_gran.h
	M			src/neigh_half_bin.h
	M			src/neigh_half_multi.h
	M			src/neigh_half_nsq.h
	M			src/neigh_respa.h
	M			src/pair.cpp
	M			src/pair_beck.h
	M			src/pair_hybrid.h
	M			src/pair_lj_smooth_linear.h
	M			src/thermo.h
	M			src/version.h