Diffusion lammps 86b3cbad7142

Merge branch 'master' into lammps-icms
86b3cbad7142
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 9 2012, 14:30.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 9 2012, 14:30

Pushed

junge

Oct 6 2016, 16:49

Parents

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

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS86b3cbad7142: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 9 2012, 14:30

Merged Changes

Commit	Author	Details	Committed
b1c466174bdd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8586 f3b2605a-c512-4ea7…	Aug 8 2012
fe3fdb151c00	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8583 f3b2605a-c512-4ea7…	Aug 8 2012
a897f70c43db	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8582 f3b2605a-c512-4ea7…	Aug 8 2012
8c4058d37825	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8579 f3b2605a-c512-4ea7…	Aug 8 2012
79f91e4617eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8578 f3b2605a-c512-4ea7…	Aug 8 2012
7eb94ace4fbd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8577 f3b2605a-c512-4ea7…	Aug 8 2012
a63690e51318	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8576 f3b2605a-c512-4ea7…	Aug 8 2012
77880cb45a3b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8575 f3b2605a-c512-4ea7…	Aug 8 2012
f34e434316b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8573 f3b2605a-c512-4ea7…	Aug 8 2012
6eb808907559	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8572 f3b2605a-c512-4ea7…	Aug 8 2012
296cf4fab2d5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8571 f3b2605a-c512-4ea7…	Aug 8 2012
4210601e4183	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8570 f3b2605a-c512-4ea7…	Aug 8 2012
b47e7e7bded9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8569 f3b2605a-c512-4ea7…	Aug 8 2012
1236aa9a4a8d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8568 f3b2605a-c512-4ea7…	Aug 8 2012
0271bc482f6e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8566 f3b2605a-c512-4ea7…	Aug 8 2012
21abfef15c47	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8565 f3b2605a-c512-4ea7…	Aug 8 2012
2d1d82784260	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8564 f3b2605a-c512-4ea7…	Aug 8 2012
628ef9081f68	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8563 f3b2605a-c512-4ea7…	Aug 8 2012
5132647c396b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8562 f3b2605a-c512-4ea7…	Aug 8 2012
40a2577564e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8560 f3b2605a-c512-4ea7…	Aug 8 2012
6be09326c074	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8558 f3b2605a-c512-4ea7…	Aug 8 2012
0971332fe39a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8557 f3b2605a-c512-4ea7…	Aug 8 2012
ca31cc85fef2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8555 f3b2605a-c512-4ea7…	Aug 7 2012
898b0f0a864a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8554 f3b2605a-c512-4ea7…	Aug 7 2012
4fefccb4386b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8553 f3b2605a-c512-4ea7…	Aug 7 2012
16114b3b95e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8552 f3b2605a-c512-4ea7…	Aug 7 2012
be1e06897bd6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8551 f3b2605a-c512-4ea7…	Aug 7 2012

Changes (56)

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	A			doc/box.html
	A			doc/box.txt
	M			doc/change_box.html
	M			doc/change_box.txt
	M			doc/compute.html
	M			doc/compute.txt
	A			doc/compute_contact_atom.html
	A			doc/compute_contact_atom.txt
	M			doc/compute_coord_atom.html
	M			doc/compute_coord_atom.txt
	M			doc/fix_box_relax.html
	M			doc/fix_box_relax.txt
	M			doc/fix_deform.html
	M			doc/fix_deform.txt
	M			doc/fix_gcmc.html
	M			doc/fix_gcmc.txt
	M			doc/fix_nh.html
	M			doc/fix_nh.txt
	M			doc/pair_kim.html
	M			doc/pair_kim.txt
	M			examples/kim/in.kim.lj
	M			examples/kim/in.kim.lj.lmp
	V			examples/kim/{log.kim.lj.12Jul12.mac_mpi.1 ← log.kim.lj.9Jan12.linux.1}
	V			examples/kim/{log.kim.lj.12Jul12.mac_mpi.4 ← log.kim.lj.9Jan12.linux.4}
	V			examples/kim/{log.kim.lj.9Jan12.linux.1 → log.kim.lj.12Jul12.mac_mpi.1}
	V			examples/kim/{log.kim.lj.9Jan12.linux.4 → log.kim.lj.12Jul12.mac_mpi.4}
	V			examples/kim/{log.kim.lj.lmp.12Jul12.mac_mpi.1 ← log.kim.lj.lmp.9Jan12.linux.1}
	V			examples/kim/{log.kim.lj.lmp.12Jul12.mac_mpi.4 ← log.kim.lj.lmp.9Jan12.linux.4}
	V			examples/kim/{log.kim.lj.lmp.9Jan12.linux.1 → log.kim.lj.lmp.12Jul12.mac_mpi.1}
	V			examples/kim/{log.kim.lj.lmp.9Jan12.linux.4 → log.kim.lj.lmp.12Jul12.mac_mpi.4}
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/KIM/pair_kim.cpp
	M			src/KIM/pair_kim.h
	M			src/KSPACE/pppm.cpp
	M			src/MC/fix_gcmc.cpp
	M			src/MC/fix_gcmc.h
	P			src/compute_contact_atom.cpp Copied from src/compute_coord_atom.cpp
	P			src/compute_contact_atom.h Copied from src/compute_pe_atom.h
	P			src/compute_coord_atom.cpp Copied to src/compute_contact_atom.cpp
	M			src/compute_coord_atom.h
	M			src/domain.cpp
	M			src/domain.h
	M			src/fix_deform.cpp
	M			src/fix_deform.h
	M			src/fix_nh.cpp
	M			src/fix_nh.h
	M			src/input.cpp
	M			src/input.h
	M			src/neigh_request.h
	M			src/neighbor.cpp
	M			src/version.h
	M			tools/restart2data.cpp