Diffusion lammps 5026f4b7886b

Merge branch 'master' into lammps-icms
5026f4b7886b
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 10 2012, 15:05.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 10 2012, 15:05

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSc3748688aa5f: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7499 f3b2605a-c512-4ea7…
rLAMMPS456215e99718: sync comb/omp with changes in plain comb

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS5026f4b7886b: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 10 2012, 15:05

Merged Changes

Commit	Author	Details	Committed
c3748688aa5f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7499 f3b2605a-c512-4ea7…	Jan 10 2012
66ad4f5c21b7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7498 f3b2605a-c512-4ea7…	Jan 10 2012
34c19302013f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7497 f3b2605a-c512-4ea7…	Jan 10 2012
36ae86996e02	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7496 f3b2605a-c512-4ea7…	Jan 10 2012
9a3ab257bd1d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7495 f3b2605a-c512-4ea7…	Jan 10 2012
c414186e3581	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7493 f3b2605a-c512-4ea7…	Jan 10 2012
0bec8479f36e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7492 f3b2605a-c512-4ea7…	Jan 10 2012
658b391e6a9e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7491 f3b2605a-c512-4ea7…	Jan 10 2012
c29ded40961a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7490 f3b2605a-c512-4ea7…	Jan 10 2012
3cf4cb270671	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7489 f3b2605a-c512-4ea7…	Jan 10 2012
876112a0c6a5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7488 f3b2605a-c512-4ea7…	Jan 10 2012
f9d24c40127e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7487 f3b2605a-c512-4ea7…	Jan 10 2012
8de7c3e24181	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7480 f3b2605a-c512-4ea7…	Jan 9 2012
4c61ce2fb45e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7478 f3b2605a-c512-4ea7…	Jan 9 2012
411a21d6b0c9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7477 f3b2605a-c512-4ea7…	Jan 9 2012
0fba6fd65816	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7476 f3b2605a-c512-4ea7…	Jan 9 2012
fc5482c2401c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7472 f3b2605a-c512-4ea7…	Jan 9 2012
8c1481250b57	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7471 f3b2605a-c512-4ea7…	Jan 9 2012
75a49712c772	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7470 f3b2605a-c512-4ea7…	Jan 9 2012
46d332f71198	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7468 f3b2605a-c512-4ea7…	Jan 9 2012
a9f695113b10	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7467 f3b2605a-c512-4ea7…	Jan 9 2012
9e4fd659e9d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7466 f3b2605a-c512-4ea7…	Jan 9 2012
619f3e50e225	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7465 f3b2605a-c512-4ea7…	Jan 9 2012

Changes (263)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	V			bench/{log.28Mar11.chain.fixed.linux.1 → log.9Jan12.chain.fixed.linux.1}
	V			bench/{log.28Mar11.chain.fixed.linux.4 → log.9Jan12.chain.fixed.linux.4}
	V			bench/{log.28Mar11.chain.scaled.linux.4 → log.9Jan12.chain.scaled.linux.4}
	V			bench/{log.28Mar11.chute.fixed.linux.1 → log.9Jan12.chute.fixed.linux.1}
	V			bench/{log.28Mar11.chute.fixed.linux.4 → log.9Jan12.chute.fixed.linux.4}
	V			bench/{log.28Mar11.chute.scaled.linux.4 → log.9Jan12.chute.scaled.linux.4}
	V			bench/{log.28Mar11.eam.fixed.linux.1 → log.9Jan12.eam.fixed.linux.1}
	V			bench/{log.28Mar11.eam.fixed.linux.4 → log.9Jan12.eam.fixed.linux.4}
	V			bench/{log.28Mar11.eam.scaled.linux.4 → log.9Jan12.eam.scaled.linux.4}
	V			bench/{log.28Mar11.lj.fixed.linux.1 → log.9Jan12.lj.fixed.linux.1}
	V			bench/{log.28Mar11.lj.fixed.linux.4 → log.9Jan12.lj.fixed.linux.4}
	V			bench/{log.28Mar11.lj.scaled.linux.4 → log.9Jan12.lj.scaled.linux.4}
	V			bench/{log.28Mar11.rhodo.fixed.linux.1 → log.9Jan12.rhodo.fixed.linux.1}
	V			bench/{log.28Mar11.rhodo.fixed.linux.4 → log.9Jan12.rhodo.fixed.linux.4}
	V			bench/{log.28Mar11.rhodo.scaled.linux.4 → log.9Jan12.rhodo.scaled.linux.4}
	V			bench/{log.9Jan12.chain.fixed.linux.1 ← log.28Mar11.chain.fixed.linux.1}
	V			bench/{log.9Jan12.chain.fixed.linux.4 ← log.28Mar11.chain.fixed.linux.4}
	V			bench/{log.9Jan12.chain.scaled.linux.4 ← log.28Mar11.chain.scaled.linux.4}
	V			bench/{log.9Jan12.chute.fixed.linux.1 ← log.28Mar11.chute.fixed.linux.1}
	V			bench/{log.9Jan12.chute.fixed.linux.4 ← log.28Mar11.chute.fixed.linux.4}
	V			bench/{log.9Jan12.chute.scaled.linux.4 ← log.28Mar11.chute.scaled.linux.4}
	V			bench/{log.9Jan12.eam.fixed.linux.1 ← log.28Mar11.eam.fixed.linux.1}
	V			bench/{log.9Jan12.eam.fixed.linux.4 ← log.28Mar11.eam.fixed.linux.4}
	V			bench/{log.9Jan12.eam.scaled.linux.4 ← log.28Mar11.eam.scaled.linux.4}
	V			bench/{log.9Jan12.lj.fixed.linux.1 ← log.28Mar11.lj.fixed.linux.1}
	V			bench/{log.9Jan12.lj.fixed.linux.4 ← log.28Mar11.lj.fixed.linux.4}
	V			bench/{log.9Jan12.lj.scaled.linux.4 ← log.28Mar11.lj.scaled.linux.4}
	V			bench/{log.9Jan12.rhodo.fixed.linux.1 ← log.28Mar11.rhodo.fixed.linux.1}
	V			bench/{log.9Jan12.rhodo.fixed.linux.4 ← log.28Mar11.rhodo.fixed.linux.4}
	V			bench/{log.9Jan12.rhodo.scaled.linux.4 ← log.28Mar11.rhodo.scaled.linux.4}
	A			doc/Eqs/pair_lj_smooth_linear.jpg
	A			doc/Eqs/pair_lj_smooth_linear.tex
	M			doc/Manual.pdf
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_intro.html
	M			doc/Section_intro.txt
	M			doc/Section_packages.html
	M			doc/Section_packages.txt
	M			doc/pair_coeff.html
	M			doc/pair_coeff.txt
	P			doc/pair_lj_cut_smooth.html Copied from doc/pair_lj_smooth.html
	P			doc/pair_lj_smooth.html Copied to doc/pair_lj_cut_smooth.html
	M			doc/pair_lj_smooth.txt
	A			doc/pair_lj_smooth_linear.html
	A			doc/pair_lj_smooth_linear.txt
	M			doc/pair_style.html
	M			doc/pair_style.txt
	D			examples/colloid/log.colloid.28Mar11.linux.1
	D			examples/colloid/log.colloid.28Mar11.linux.4
	A			examples/colloid/log.colloid.9Jan12.linux.1
	A			examples/colloid/log.colloid.9Jan12.linux.4
	D			examples/comb/log.comb.Cu.28Mar11.linux.1
	D			examples/comb/log.comb.Cu.28Mar11.linux.4
	A			examples/comb/log.comb.Cu.9Jan12.linux.1
	A			examples/comb/log.comb.Cu.9Jan12.linux.4
	D			examples/comb/log.comb.Cu2O.elastic.28Mar11.linux.1
	D			examples/comb/log.comb.Cu2O.elastic.28Mar11.linux.4
	A			examples/comb/log.comb.Cu2O.elastic.9Jan12.linux.1
	A			examples/comb/log.comb.Cu2O.elastic.9Jan12.linux.4
	A			examples/comb/log.comb.HfO2.9Jan12.linux.1
	A			examples/comb/log.comb.HfO2.9Jan12.linux.4
	D			examples/comb/log.comb.Si.28Mar11.linux.1
	D			examples/comb/log.comb.Si.28Mar11.linux.4
	A			examples/comb/log.comb.Si.9Jan12.linux.1
	A			examples/comb/log.comb.Si.9Jan12.linux.4
	D			examples/comb/log.comb.Si.elastic.28Mar11.linux.1
	D			examples/comb/log.comb.Si.elastic.28Mar11.linux.4
	A			examples/comb/log.comb.Si.elastic.9Jan12.linux.1
	A			examples/comb/log.comb.Si.elastic.9Jan12.linux.4
	V			examples/crack/{log.crack.28Mar11.linux.1 → log.crack.9Jan12.linux.1}
	V			examples/crack/{log.crack.28Mar11.linux.4 → log.crack.9Jan12.linux.4}
	V			examples/crack/{log.crack.9Jan12.linux.1 ← log.crack.28Mar11.linux.1}
	V			examples/crack/{log.crack.9Jan12.linux.4 ← log.crack.28Mar11.linux.4}
	D			examples/dipole/log.dipole.28Mar11.linux.1
	D			examples/dipole/log.dipole.28Mar11.linux.4
	A			examples/dipole/log.dipole.9Jan12.linux.1
	A			examples/dipole/log.dipole.9Jan12.linux.4
	V			examples/dreiding/{log.dreiding.11Oct11.linux.1 → log.dreiding.9Jan12.linux.1}
	V			examples/dreiding/{log.dreiding.11Oct11.linux.4 → log.dreiding.9Jan12.linux.4}
	V			examples/dreiding/{log.dreiding.9Jan12.linux.1 ← log.dreiding.11Oct11.linux.1}
	V			examples/dreiding/{log.dreiding.9Jan12.linux.4 ← log.dreiding.11Oct11.linux.4}
	V			examples/eim/{log.eim.28Mar11.linux.1 → log.eim.9Jan12.linux.1}
	V			examples/eim/{log.eim.28Mar11.linux.4 → log.eim.9Jan12.linux.4}
	V			examples/eim/{log.eim.9Jan12.linux.1 ← log.eim.28Mar11.linux.1}
	V			examples/eim/{log.eim.9Jan12.linux.4 ← log.eim.28Mar11.linux.4}
	V			examples/ellipse/{log.ellipse.gayberne.28Mar11.linux.1 → log.ellipse.gayberne.9Jan12.linux.1}
	V			examples/ellipse/{log.ellipse.gayberne.28Mar11.linux.4 → log.ellipse.gayberne.9Jan12.linux.4}
	V			examples/ellipse/{log.ellipse.gayberne.9Jan12.linux.1 ← log.ellipse.gayberne.28Mar11.linux.1}
	V			examples/ellipse/{log.ellipse.gayberne.9Jan12.linux.4 ← log.ellipse.gayberne.28Mar11.linux.4}
	V			examples/ellipse/{log.ellipse.resquared.28Mar11.linux.1 → log.ellipse.resquared.9Jan12.linux.1}
	V			examples/ellipse/{log.ellipse.resquared.28Mar11.linux.4 → log.ellipse.resquared.9Jan12.linux.4}
	V			examples/ellipse/{log.ellipse.resquared.9Jan12.linux.1 ← log.ellipse.resquared.28Mar11.linux.1}
	V			examples/ellipse/{log.ellipse.resquared.9Jan12.linux.4 ← log.ellipse.resquared.28Mar11.linux.4}
	V			examples/flow/{log.flow.couette.28Mar11.linux.1 → log.flow.couette.9Jan12.linux.1}
	V			examples/flow/{log.flow.couette.28Mar11.linux.4 → log.flow.couette.9Jan12.linux.4}
	V			examples/flow/{log.flow.couette.9Jan12.linux.1 ← log.flow.couette.28Mar11.linux.1}
	V			examples/flow/{log.flow.couette.9Jan12.linux.4 ← log.flow.couette.28Mar11.linux.4}
	V			examples/flow/{log.flow.pois.28Mar11.linux.1 → log.flow.pois.9Jan12.linux.1}
	V			examples/flow/{log.flow.pois.28Mar11.linux.4 → log.flow.pois.9Jan12.linux.4}
	V			examples/flow/{log.flow.pois.9Jan12.linux.1 ← log.flow.pois.28Mar11.linux.1}
	V			examples/flow/{log.flow.pois.9Jan12.linux.4 ← log.flow.pois.28Mar11.linux.4}
	V			examples/friction/{log.friction.28Mar11.linux.1 → log.friction.9Jan12.linux.1}
	V			examples/friction/{log.friction.28Mar11.linux.4 → log.friction.9Jan12.linux.4}
	V			examples/friction/{log.friction.9Jan12.linux.1 ← log.friction.28Mar11.linux.1}
	V			examples/friction/{log.friction.9Jan12.linux.4 ← log.friction.28Mar11.linux.4}
	V			examples/gpu/{in.gpu.melt.2.5 ← in.melt_2.5.gpu}
	V			examples/gpu/{in.gpu.melt.5.0 ← in.melt_5.0.gpu}
	V			examples/gpu/{in.gpu.phosphate ← in.phosphate.gpu}
	V			examples/gpu/{in.gpu.rhodo ← in.rhodo.gpu}
	V			examples/gpu/{in.melt_2.5.gpu → in.gpu.melt.2.5}
	V			examples/gpu/{in.melt_5.0.gpu → in.gpu.melt.5.0}
	V			examples/gpu/{in.phosphate.gpu → in.gpu.phosphate}
	V			examples/gpu/{in.rhodo.gpu → in.gpu.rhodo}
	A			examples/gpu/log.gpu.melt.2.5.9Jan12.linux.1
	A			examples/gpu/log.gpu.melt.2.5.9Jan12.linux.4
	A			examples/gpu/log.gpu.melt.5.0.9Jan12.linux.1
	A			examples/gpu/log.gpu.melt.5.0.9Jan12.linux.4
	A			examples/gpu/log.gpu.phosphate.9Jan12.linux.1
	A			examples/gpu/log.gpu.phosphate.9Jan12.linux.4
	A			examples/gpu/log.gpu.rhodo.9Jan12.linux.1
	A			examples/gpu/log.gpu.rhodo.9Jan12.linux.4
	V			examples/hugoniostat/{in.hugoniostat ← in.nphug}
	V			examples/hugoniostat/{in.nphug → in.hugoniostat}
	A			examples/hugoniostat/log.hugoniostat.9Jan12.linux.1
	A			examples/hugoniostat/log.hugoniostat.9Jan12.linux.4
	V			examples/indent/{log.indent.28Mar11.linux.1 → log.indent.9Jan12.linux.1}
	V			examples/indent/{log.indent.28Mar11.linux.4 → log.indent.9Jan12.linux.4}
	V			examples/indent/{log.indent.9Jan12.linux.1 ← log.indent.28Mar11.linux.1}
	V			examples/indent/{log.indent.9Jan12.linux.4 ← log.indent.28Mar11.linux.4}
	V			examples/indent/{log.indent.min.28Mar11.linux.1 → log.indent.min.9Jan12.linux.1}
	V			examples/indent/{log.indent.min.28Mar11.linux.4 → log.indent.min.9Jan12.linux.4}
	V			examples/indent/{log.indent.min.9Jan12.linux.1 ← log.indent.min.28Mar11.linux.1}
	V			examples/indent/{log.indent.min.9Jan12.linux.4 ← log.indent.min.28Mar11.linux.4}
	V			examples/meam/{log.meam.28Mar11.linux.1 → log.meam.9Jan12.linux.1}
	V			examples/meam/{log.meam.28Mar11.linux.4 → log.meam.9Jan12.linux.4}
	V			examples/meam/{log.meam.9Jan12.linux.1 ← log.meam.28Mar11.linux.1}
	V			examples/meam/{log.meam.9Jan12.linux.4 ← log.meam.28Mar11.linux.4}
	V			examples/meam/{log.meam.shear.28Mar11.linux.1 → log.meam.shear.9Jan12.linux.1}
	V			examples/meam/{log.meam.shear.28Mar11.linux.4 → log.meam.shear.9Jan12.linux.4}
	V			examples/meam/{log.meam.shear.9Jan12.linux.1 ← log.meam.shear.28Mar11.linux.1}
	V			examples/meam/{log.meam.shear.9Jan12.linux.4 ← log.meam.shear.28Mar11.linux.4}
	V			examples/melt/{log.melt.28Mar11.linux.1 → log.melt.9Jan12.linux.1}
	V			examples/melt/{log.melt.28Mar11.linux.4 → log.melt.9Jan12.linux.4}
	V			examples/melt/{log.melt.9Jan12.linux.1 ← log.melt.28Mar11.linux.1}
	V			examples/melt/{log.melt.9Jan12.linux.4 ← log.melt.28Mar11.linux.4}
	D			examples/micelle/log.micelle.28Mar11.linux.1
	D			examples/micelle/log.micelle.28Mar11.linux.4
	A			examples/micelle/log.micelle.9Jan12.linux.1
	A			examples/micelle/log.micelle.9Jan12.linux.4
	V			examples/min/{log.min.28Mar11.linux.1 → log.min.9Jan12.linux.1}
	V			examples/min/{log.min.28Mar11.linux.4 → log.min.9Jan12.linux.4}
	V			examples/min/{log.min.9Jan12.linux.1 ← log.min.28Mar11.linux.1}
	V			examples/min/{log.min.9Jan12.linux.4 ← log.min.28Mar11.linux.4}
	A			examples/min/log.min.box.9Jan12.linux.1
	A			examples/min/log.min.box.9Jan12.linux.4
	V			examples/msst/{log.msst.28Mar11.linux.1 → log.msst.9Jan12.linux.1}
	V			examples/msst/{log.msst.28Mar11.linux.4 → log.msst.9Jan12.linux.4}
	V			examples/msst/{log.msst.9Jan12.linux.1 ← log.msst.28Mar11.linux.1}
	V			examples/msst/{log.msst.9Jan12.linux.4 ← log.msst.28Mar11.linux.4}
	V			examples/neb/{log.neb.hop1.28Mar11.linux.4 → log.neb.hop1.9Jan12.linux.4}
	V			examples/neb/{log.neb.hop1.9Jan12.linux.4 ← log.neb.hop1.28Mar11.linux.4}
	V			examples/neb/{log.neb.hop2.28Mar11.linux.4 → log.neb.hop2.9Jan12.linux.4}
	V			examples/neb/{log.neb.hop2.9Jan12.linux.4 ← log.neb.hop2.28Mar11.linux.4}
	V			examples/nemd/{log.nemd.28Mar11.linux.1 → log.nemd.9Jan12.linux.1}
	V			examples/nemd/{log.nemd.28Mar11.linux.4 → log.nemd.9Jan12.linux.4}
	V			examples/nemd/{log.nemd.9Jan12.linux.1 ← log.nemd.28Mar11.linux.1}
	V			examples/nemd/{log.nemd.9Jan12.linux.4 ← log.nemd.28Mar11.linux.4}
	V			examples/obstacle/{log.obstacle.28Mar11.linux.1 → log.obstacle.9Jan12.linux.1}
	V			examples/obstacle/{log.obstacle.28Mar11.linux.4 → log.obstacle.9Jan12.linux.4}
	V			examples/obstacle/{log.obstacle.9Jan12.linux.1 ← log.obstacle.28Mar11.linux.1}
	V			examples/obstacle/{log.obstacle.9Jan12.linux.4 ← log.obstacle.28Mar11.linux.4}
	V			examples/peptide/{log.peptide.28Mar11.linux.1 → log.peptide.9Jan12.linux.1}
	V			examples/peptide/{log.peptide.28Mar11.linux.4 → log.peptide.9Jan12.linux.4}
	V			examples/peptide/{log.peptide.9Jan12.linux.1 ← log.peptide.28Mar11.linux.1}
	V			examples/peptide/{log.peptide.9Jan12.linux.4 ← log.peptide.28Mar11.linux.4}
	V			examples/peri/{log.peri.28Mar11.linux.1 → log.peri.9Jan12.linux.1}
	V			examples/peri/{log.peri.28Mar11.linux.4 → log.peri.9Jan12.linux.4}
	V			examples/peri/{log.peri.9Jan12.linux.1 ← log.peri.28Mar11.linux.1}
	V			examples/peri/{log.peri.9Jan12.linux.4 ← log.peri.28Mar11.linux.4}
	D			examples/pour/log.pour.28Mar11.linux.1
	D			examples/pour/log.pour.28Mar11.linux.4
	V			examples/pour/{log.pour.2d.28Mar11.linux.1 → log.pour.2d.9Jan12.linux.1}
	V			examples/pour/{log.pour.2d.28Mar11.linux.4 → log.pour.2d.9Jan12.linux.4}
	V			examples/pour/{log.pour.2d.9Jan12.linux.1 ← log.pour.2d.28Mar11.linux.1}
	V			examples/pour/{log.pour.2d.9Jan12.linux.4 ← log.pour.2d.28Mar11.linux.4}
	A			examples/pour/log.pour.9Jan12.linux.1
	A			examples/pour/log.pour.9Jan12.linux.4
	D			examples/prd/log.prd.0.28Mar11.linux.4
	A			examples/prd/log.prd.0.9Jan12.linux.4
	D			examples/prd/log.prd.1.28Mar11.linux.4
	A			examples/prd/log.prd.1.9Jan12.linux.4
	D			examples/prd/log.prd.2.28Mar11.linux.4
	A			examples/prd/log.prd.2.9Jan12.linux.4
	D			examples/prd/log.prd.28Mar11.linux.4
	D			examples/prd/log.prd.3.28Mar11.linux.4
	A			examples/prd/log.prd.3.9Jan12.linux.4
	A			examples/prd/log.prd.9Jan12.linux.4
	M			examples/reax/in.reax.rdx
	M			examples/reax/in.reaxc.rdx
	M			examples/reax/in.reaxc.tatb
	D			examples/reax/log.reax.rdx.28Mar11.linux.1
	D			examples/reax/log.reax.rdx.28Mar11.linux.4
	A			examples/reax/log.reax.rdx.9Jan12.linux.1
	A			examples/reax/log.reax.rdx.9Jan12.linux.4
	V			examples/reax/{log.reax.tatb.28Mar11.linux.1 → log.reax.tatb.9Jan12.linux.1}
	V			examples/reax/{log.reax.tatb.28Mar11.linux.4 → log.reax.tatb.9Jan12.linux.4}
	V			examples/reax/{log.reax.tatb.9Jan12.linux.1 ← log.reax.tatb.28Mar11.linux.1}
	V			examples/reax/{log.reax.tatb.9Jan12.linux.4 ← log.reax.tatb.28Mar11.linux.4}
	D			examples/reax/log.reaxc.rdx.28Mar11.linux.1
	D			examples/reax/log.reaxc.rdx.28Mar11.linux.4
	A			examples/reax/log.reaxc.rdx.9Jan12.linux.1
	A			examples/reax/log.reaxc.rdx.9Jan12.linux.4
	V			examples/reax/{log.reaxc.tatb.28Mar11.linux.1 → log.reaxc.tatb.9Jan12.linux.1}
	V			examples/reax/{log.reaxc.tatb.28Mar11.linux.4 → log.reaxc.tatb.9Jan12.linux.4}
	V			examples/reax/{log.reaxc.tatb.9Jan12.linux.1 ← log.reaxc.tatb.28Mar11.linux.1}
	V			examples/reax/{log.reaxc.tatb.9Jan12.linux.4 ← log.reaxc.tatb.28Mar11.linux.4}
	V			examples/rigid/{log.rigid.28Mar11.linux.1 → log.rigid.9Jan12.linux.1}
	V			examples/rigid/{log.rigid.28Mar11.linux.4 → log.rigid.9Jan12.linux.4}
	V			examples/rigid/{log.rigid.9Jan12.linux.1 ← log.rigid.28Mar11.linux.1}
	V			examples/rigid/{log.rigid.9Jan12.linux.4 ← log.rigid.28Mar11.linux.4}
	V			examples/rigid/{log.rigid.poems.28Mar11.linux.1 → log.rigid.poems.9Jan12.linux.1}
	V			examples/rigid/{log.rigid.poems.28Mar11.linux.4 → log.rigid.poems.9Jan12.linux.4}
	V			examples/rigid/{log.rigid.poems.9Jan12.linux.1 ← log.rigid.poems.28Mar11.linux.1}
	V			examples/rigid/{log.rigid.poems.9Jan12.linux.4 ← log.rigid.poems.28Mar11.linux.4}
	V			examples/rigid/{log.rigid.poems2.28Mar11.linux.1 → log.rigid.poems2.9Jan12.linux.1}
	V			examples/rigid/{log.rigid.poems2.28Mar11.linux.4 → log.rigid.poems2.9Jan12.linux.4}
	V			examples/rigid/{log.rigid.poems2.9Jan12.linux.1 ← log.rigid.poems2.28Mar11.linux.1}
	V			examples/rigid/{log.rigid.poems2.9Jan12.linux.4 ← log.rigid.poems2.28Mar11.linux.4}
	V			examples/shear/{log.shear.28Mar11.linux.1 → log.shear.9Jan12.linux.1}
	V			examples/shear/{log.shear.28Mar11.linux.4 → log.shear.9Jan12.linux.4}
	V			examples/shear/{log.shear.9Jan12.linux.1 ← log.shear.28Mar11.linux.1}
	V			examples/shear/{log.shear.9Jan12.linux.4 ← log.shear.28Mar11.linux.4}
	V			examples/shear/{log.shear.void.28Mar11.linux.1 → log.shear.void.9Jan12.linux.1}
	V			examples/shear/{log.shear.void.28Mar11.linux.4 → log.shear.void.9Jan12.linux.4}
	V			examples/shear/{log.shear.void.9Jan12.linux.1 ← log.shear.void.28Mar11.linux.1}
	V			examples/shear/{log.shear.void.9Jan12.linux.4 ← log.shear.void.28Mar11.linux.4}
	D			examples/srd/log.srd.mixture.28Mar11.linux.1
	D			examples/srd/log.srd.mixture.28Mar11.linux.4
	A			examples/srd/log.srd.mixture.9Jan12.linux.1
	A			examples/srd/log.srd.mixture.9Jan12.linux.4
	V			examples/srd/{log.srd.pure.28Mar11.linux.1 → log.srd.pure.9Jan12.linux.1}
	V			examples/srd/{log.srd.pure.28Mar11.linux.4 → log.srd.pure.9Jan12.linux.4}
	V			examples/srd/{log.srd.pure.9Jan12.linux.1 ← log.srd.pure.28Mar11.linux.1}
	V			examples/srd/{log.srd.pure.9Jan12.linux.4 ← log.srd.pure.28Mar11.linux.4}
	V			examples/tad/{log.tad.0.28Mar11.linux.3 → log.tad.0.9Jan12.linux.3}
	V			examples/tad/{log.tad.0.9Jan12.linux.3 ← log.tad.0.28Mar11.linux.3}
	V			examples/tad/{log.tad.1.28Mar11.linux.3 → log.tad.1.9Jan12.linux.3}
	V			examples/tad/{log.tad.1.9Jan12.linux.3 ← log.tad.1.28Mar11.linux.3}
	V			examples/tad/{log.tad.2.28Mar11.linux.3 → log.tad.2.9Jan12.linux.3}
	V			examples/tad/{log.tad.2.9Jan12.linux.3 ← log.tad.2.28Mar11.linux.3}
	D			examples/tad/log.tad.28Mar11.linux.3
	A			examples/tad/log.tad.9Jan12.linux.3
	V			examples/tad/{log.tad.neb.28Mar11.linux.3 → log.tad.neb.9Jan12.linux.3}
	V			examples/tad/{log.tad.neb.9Jan12.linux.3 ← log.tad.neb.28Mar11.linux.3}
	M			lib/reax/Makefile.lammps
	M			src/MEAM/Install.sh
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/image.cpp
	M			src/neighbor.h
	A			src/pair_lj_smooth_linear.cpp
	A			src/pair_lj_smooth_linear.h
	M			src/version.h