Diffusion lammps 77f06b1dfec1

Merge remote branch 'lammps-ro/master' into lammps-icms
77f06b1dfec1
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 31 2013, 14:39.

Description

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

Resolved Conflicts:
doc/Manual.txt
doc/Section_start.txt
src/citeme.cpp
src/citeme.h
src/lammps.cpp
src/neighbor.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 31 2013, 14:39

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSbb72ec9d1f50: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10500 f3b2605a-c512-4ea7…
rLAMMPSc6a0482023bf: Merge remote branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS77f06b1dfec1: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 31 2013, 14:39

Merged Changes

Commit	Author	Details	Committed
bb72ec9d1f50	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10500 f3b2605a-c512-4ea7…	Jul 30 2013
5b00a238c313	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10499 f3b2605a-c512-4ea7…	Jul 30 2013
13b38d09e55e	rjones	test if I can commit	Jul 30 2013
74b4c894a228	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10497 f3b2605a-c512-4ea7…	Jul 30 2013
dd08396f7557	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10496 f3b2605a-c512-4ea7…	Jul 30 2013
927aa02d1d44	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10494 f3b2605a-c512-4ea7…	Jul 30 2013
f0f88dae92e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10493 f3b2605a-c512-4ea7…	Jul 30 2013
c612b724dfc3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10492 f3b2605a-c512-4ea7…	Jul 30 2013
059eb04e390f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10491 f3b2605a-c512-4ea7…	Jul 30 2013
8fff5ac7a174	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10490 f3b2605a-c512-4ea7…	Jul 30 2013
d388f9d84ada	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10488 f3b2605a-c512-4ea7…	Jul 30 2013
0fbc6e52a451	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10487 f3b2605a-c512-4ea7…	Jul 30 2013
e62963a7f056	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10486 f3b2605a-c512-4ea7…	Jul 30 2013
056264f86faa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10485 f3b2605a-c512-4ea7…	Jul 30 2013

Changes (65)

				Path
	V			bench/{log.30Jul13.chain.fixed.linux.1 ← log.9Jan12.chain.fixed.linux.1}
	V			bench/{log.30Jul13.chain.fixed.linux.4 ← log.9Jan12.chain.fixed.linux.4}
	V			bench/{log.30Jul13.chain.scaled.linux.4 ← log.9Jan12.chain.scaled.linux.4}
	V			bench/{log.30Jul13.chute.fixed.linux.1 ← log.9Jan12.chute.fixed.linux.1}
	V			bench/{log.30Jul13.chute.fixed.linux.4 ← log.9Jan12.chute.fixed.linux.4}
	V			bench/{log.30Jul13.chute.scaled.linux.4 ← log.9Jan12.chute.scaled.linux.4}
	V			bench/{log.30Jul13.eam.fixed.linux.1 ← log.9Jan12.eam.fixed.linux.1}
	V			bench/{log.30Jul13.eam.fixed.linux.4 ← log.9Jan12.eam.fixed.linux.4}
	V			bench/{log.30Jul13.eam.scaled.linux.4 ← log.9Jan12.eam.scaled.linux.4}
	V			bench/{log.30Jul13.lj.fixed.linux.1 ← log.9Jan12.lj.fixed.linux.1}
	V			bench/{log.30Jul13.lj.fixed.linux.4 ← log.9Jan12.lj.fixed.linux.4}
	V			bench/{log.30Jul13.lj.scaled.linux.4 ← log.9Jan12.lj.scaled.linux.4}
	A			bench/log.30Jul13.rhodo.fixed.linux.1
	A			bench/log.30Jul13.rhodo.fixed.linux.4
	A			bench/log.30Jul13.rhodo.scaled.linux.4
	V			bench/{log.9Jan12.chain.fixed.linux.1 → log.30Jul13.chain.fixed.linux.1}
	V			bench/{log.9Jan12.chain.fixed.linux.4 → log.30Jul13.chain.fixed.linux.4}
	V			bench/{log.9Jan12.chain.scaled.linux.4 → log.30Jul13.chain.scaled.linux.4}
	V			bench/{log.9Jan12.chute.fixed.linux.1 → log.30Jul13.chute.fixed.linux.1}
	V			bench/{log.9Jan12.chute.fixed.linux.4 → log.30Jul13.chute.fixed.linux.4}
	V			bench/{log.9Jan12.chute.scaled.linux.4 → log.30Jul13.chute.scaled.linux.4}
	V			bench/{log.9Jan12.eam.fixed.linux.1 → log.30Jul13.eam.fixed.linux.1}
	V			bench/{log.9Jan12.eam.fixed.linux.4 → log.30Jul13.eam.fixed.linux.4}
	V			bench/{log.9Jan12.eam.scaled.linux.4 → log.30Jul13.eam.scaled.linux.4}
	V			bench/{log.9Jan12.lj.fixed.linux.1 → log.30Jul13.lj.fixed.linux.1}
	V			bench/{log.9Jan12.lj.fixed.linux.4 → log.30Jul13.lj.fixed.linux.4}
	V			bench/{log.9Jan12.lj.scaled.linux.4 → log.30Jul13.lj.scaled.linux.4}
	D			bench/log.9Jan12.rhodo.fixed.linux.1
	D			bench/log.9Jan12.rhodo.fixed.linux.4
	D			bench/log.9Jan12.rhodo.scaled.linux.4
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/dump.html
	M			doc/dump.txt
	M			doc/fix_rigid.html
	M			doc/fix_rigid.txt
	M			examples/USER/atc/README
	M			src/ASPHERE/pair_gayberne.cpp
	M			src/GPU/fix_gpu.cpp
	M			src/KSPACE/pppm.cpp
	M			src/MC/fix_bond_swap.cpp
	M			src/MISC/fix_orient_fcc.cpp
	M			src/PERI/atom_vec_peri.cpp
	M			src/POEMS/fix_poems.cpp
	M			src/RIGID/fix_rigid.cpp
	M			src/SRD/fix_srd.cpp
	M			src/USER-EFF/atom_vec_electron.cpp
	M			src/USER-PHONON/fix_phonon.cpp
	M			src/USER-REAXC/fix_qeq_reax.cpp
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/citeme.cpp
	M			src/citeme.h
	M			src/comm.cpp
	M			src/comm.h
	M			src/fix_property_atom.cpp
	M			src/fix_shake.cpp
	M			src/fix_shear_history.cpp
	M			src/fix_shear_history.h
	M			src/lammps.cpp
	M			src/lammps.h
	M			src/modify.cpp
	M			src/neighbor.cpp
	M			src/version.h