Diffusion lammps 21e4a32e6528

Merge remote branch 'lammps-ro/master' into lammps-icms
21e4a32e6528
Actions

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

Description

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

Resolved Conflicts:
doc/Manual.txt
doc/pair_coeff.txt
doc/pair_lj.txt
doc/pair_style.txt
src/respa.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 8 2013, 12:26

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS10cdb7dc5e4a: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9623 f3b2605a-c512-4ea7…
rLAMMPS820f6002ef8a: add check flag that counts if all pairs have been processed

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
10cdb7dc5e4a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9623 f3b2605a-c512-4ea7…	Mar 8 2013
9cea9380c164	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9621 f3b2605a-c512-4ea7…	Mar 7 2013
99a121a3fa11	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9620 f3b2605a-c512-4ea7…	Mar 7 2013
1cdaba9662f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9619 f3b2605a-c512-4ea7…	Mar 7 2013
c4777f3ec954	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9617 f3b2605a-c512-4ea7…	Mar 7 2013
b795be4ee4ad	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9616 f3b2605a-c512-4ea7…	Mar 7 2013
bfa67dbdf835	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9614 f3b2605a-c512-4ea7…	Mar 7 2013
4fd5028c199b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9613 f3b2605a-c512-4ea7…	Mar 7 2013
c949b368e150	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9612 f3b2605a-c512-4ea7…	Mar 7 2013
52f09a7bd1fe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9611 f3b2605a-c512-4ea7…	Mar 7 2013
080dcf284925	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9610 f3b2605a-c512-4ea7…	Mar 7 2013
1dc3bee64c15	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9609 f3b2605a-c512-4ea7…	Mar 7 2013
e2a79bb807b4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9607 f3b2605a-c512-4ea7…	Mar 7 2013
bc6f0b436a4a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9606 f3b2605a-c512-4ea7…	Mar 7 2013
9f2a3147f107	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9605 f3b2605a-c512-4ea7…	Mar 7 2013
91b76139603a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9604 f3b2605a-c512-4ea7…	Mar 7 2013
3d25c94f337d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9603 f3b2605a-c512-4ea7…	Mar 7 2013
20ad5bdda326	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9602 f3b2605a-c512-4ea7…	Mar 7 2013
0316286abba2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9601 f3b2605a-c512-4ea7…	Mar 7 2013
e21af691be96	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9600 f3b2605a-c512-4ea7…	Mar 7 2013
7309370570ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9599 f3b2605a-c512-4ea7…	Mar 7 2013

Changes (32)

				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/Section_python.html
	M			doc/Section_python.txt
	M			doc/kspace_style.html
	M			doc/pair_coeff.html
	M			doc/pair_coeff.txt
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	M			doc/pair_style.html
	M			doc/pair_style.txt
	M			src/KSPACE/ewald_disp.cpp
	M			src/KSPACE/pair_lj_cut_tip4p_long.cpp
	M			src/KSPACE/pair_lj_long_coul_long.cpp
	M			src/KSPACE/pair_lj_long_tip4p_long.cpp
	M			src/KSPACE/pppm.cpp
	M			src/MOLECULE/Install.sh
	P			src/MOLECULE/pair_lj_cut_tip4p_cut.cpp Copied from src/USER-MISC/pair_lj_cut_tip4p_cut.cpp
	P			src/MOLECULE/pair_lj_cut_tip4p_cut.h Copied from src/USER-MISC/pair_lj_cut_tip4p_cut.h
	M			src/Make.sh
	M			src/RIGID/fix_rigid_small.cpp
	M			src/atom.cpp
	M			src/comm.cpp
	M			src/lammps.cpp
	M			src/respa.cpp
	M			src/verlet.cpp
	M			src/version.h