Diffusion lammps f9de6b9e61a9

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 16 2015, 13:45.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 16 2015, 13:45

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS26c09979f3b0: Added inside box check for fix_gcmc moves
rLAMMPS437099b1e237: Merge remote branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf9de6b9e61a9: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 16 2015, 13:45

Merged Changes

Commit	Author	Details	Committed
26c09979f3b0	athomps	Added inside box check for fix_gcmc moves	May 16 2015
aef75ace77e7	athomps	Added inside box check for fix_gcmc moves	May 16 2015
410549ec46b3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13475 f3b2605a-c512-4ea7…	May 15 2015
fcbf8275eb91	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13473 f3b2605a-c512-4ea7…	May 15 2015
7c5320e342d7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13472 f3b2605a-c512-4ea7…	May 15 2015
07f62aea1a51	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13471 f3b2605a-c512-4ea7…	May 15 2015
723da5079ab7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13470 f3b2605a-c512-4ea7…	May 15 2015
8177dd7612fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13469 f3b2605a-c512-4ea7…	May 15 2015
b206e23b33bd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13468 f3b2605a-c512-4ea7…	May 15 2015
6106843d57af	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13467 f3b2605a-c512-4ea7…	May 15 2015
1bdd915a90bf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13466 f3b2605a-c512-4ea7…	May 15 2015
a32bfebe880a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13465 f3b2605a-c512-4ea7…	May 15 2015
c3fd41010d41	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13464 f3b2605a-c512-4ea7…	May 15 2015
2284dcc4527a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13463 f3b2605a-c512-4ea7…	May 15 2015
29746678ff3e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13461 f3b2605a-c512-4ea7…	May 15 2015

Changes (277)

				Path
	V			bench/{log.15May15.chain.fixed.icc.1 ← log.1Feb14.chain.fixed.linux.1}
	V			bench/{log.15May15.chain.fixed.icc.4 ← log.1Feb14.chain.fixed.linux.4}
	V			bench/{log.15May15.chain.scaled.icc.4 ← log.1Feb14.chain.scaled.linux.4}
	V			bench/{log.15May15.chute.fixed.icc.1 ← log.1Feb14.chute.fixed.linux.1}
	V			bench/{log.15May15.chute.fixed.icc.4 ← log.1Feb14.chute.fixed.linux.4}
	V			bench/{log.15May15.chute.scaled.icc.4 ← log.1Feb14.chute.scaled.linux.4}
	V			bench/{log.15May15.eam.fixed.icc.1 ← log.1Feb14.eam.fixed.linux.1}
	V			bench/{log.15May15.eam.fixed.icc.4 ← log.1Feb14.eam.fixed.linux.4}
	V			bench/{log.15May15.eam.scaled.icc.4 ← log.1Feb14.eam.scaled.linux.4}
	V			bench/{log.15May15.lj.fixed.icc.1 ← log.1Feb14.lj.fixed.linux.1}
	V			bench/{log.15May15.lj.fixed.icc.4 ← log.1Feb14.lj.fixed.linux.4}
	V			bench/{log.15May15.lj.scaled.icc.4 ← log.1Feb14.lj.scaled.linux.4}
	V			bench/{log.15May15.rhodo.fixed.icc.1 ← log.1Feb14.rhodo.fixed.linux.1}
	V			bench/{log.15May15.rhodo.fixed.icc.4 ← log.1Feb14.rhodo.fixed.linux.4}
	V			bench/{log.15May15.rhodo.scaled.icc.4 ← log.1Feb14.rhodo.scaled.linux.4}
	V			bench/{log.1Feb14.chain.fixed.linux.1 → log.15May15.chain.fixed.icc.1}
	V			bench/{log.1Feb14.chain.fixed.linux.4 → log.15May15.chain.fixed.icc.4}
	V			bench/{log.1Feb14.chain.scaled.linux.4 → log.15May15.chain.scaled.icc.4}
	V			bench/{log.1Feb14.chute.fixed.linux.1 → log.15May15.chute.fixed.icc.1}
	V			bench/{log.1Feb14.chute.fixed.linux.4 → log.15May15.chute.fixed.icc.4}
	V			bench/{log.1Feb14.chute.scaled.linux.4 → log.15May15.chute.scaled.icc.4}
	V			bench/{log.1Feb14.eam.fixed.linux.1 → log.15May15.eam.fixed.icc.1}
	V			bench/{log.1Feb14.eam.fixed.linux.4 → log.15May15.eam.fixed.icc.4}
	V			bench/{log.1Feb14.eam.scaled.linux.4 → log.15May15.eam.scaled.icc.4}
	V			bench/{log.1Feb14.lj.fixed.linux.1 → log.15May15.lj.fixed.icc.1}
	V			bench/{log.1Feb14.lj.fixed.linux.4 → log.15May15.lj.fixed.icc.4}
	V			bench/{log.1Feb14.lj.scaled.linux.4 → log.15May15.lj.scaled.icc.4}
	V			bench/{log.1Feb14.rhodo.fixed.linux.1 → log.15May15.rhodo.fixed.icc.1}
	V			bench/{log.1Feb14.rhodo.fixed.linux.4 → log.15May15.rhodo.fixed.icc.4}
	V			bench/{log.1Feb14.rhodo.scaled.linux.4 → log.15May15.rhodo.scaled.icc.4}
	M			doc/Manual.html
	M			doc/Manual.pdf
	M			doc/Manual.txt
	M			doc/Section_packages.html
	M			doc/compute_fep.html
	M			doc/fix_adapt_fep.html
	M			doc/fix_atom_swap.html
	M			doc/fix_atom_swap.txt
	M			doc/fix_gle.html
	M			doc/fix_langevin.html
	M			doc/pair_lj_soft.html
	M			doc/special_bonds.html
	M			doc/special_bonds.txt
	A			examples/balance/log.15May15.balance.bond.fast.g++.1
	A			examples/balance/log.15May15.balance.bond.fast.g++.4
	V			examples/balance/{log.15May15.balance.bond.slow.g++.1 ← log.balance.bond.slow.21Jan15.linux.1}
	V			examples/balance/{log.15May15.balance.bond.slow.g++.4 ← log.balance.bond.slow.21Jan15.linux.4}
	A			examples/balance/log.15May15.balance.g++.1
	A			examples/balance/log.15May15.balance.g++.4
	D			examples/balance/log.balance.8Aug14.linux.1
	D			examples/balance/log.balance.8Aug14.linux.4
	D			examples/balance/log.balance.bond.fast.21Jan15.linux.1
	D			examples/balance/log.balance.bond.fast.21Jan15.linux.4
	V			examples/balance/{log.balance.bond.slow.21Jan15.linux.1 → log.15May15.balance.bond.slow.g++.1}
	V			examples/balance/{log.balance.bond.slow.21Jan15.linux.4 → log.15May15.balance.bond.slow.g++.4}
	A			examples/body/log.15May15.body.g++.1
	A			examples/body/log.15May15.body.g++.4
	D			examples/body/log.body.1Feb14.linux.1
	D			examples/body/log.body.1Feb14.linux.4
	A			examples/colloid/log.15May15.colloid.g++.1
	A			examples/colloid/log.15May15.colloid.g++.4
	D			examples/colloid/log.colloid.1Feb14.linux.1
	D			examples/colloid/log.colloid.1Feb14.linux.4
	V			examples/comb/{log.15May15.comb.Cu.g++.1 ← log.comb.Cu.1Feb14.linux.1}
	V			examples/comb/{log.15May15.comb.Cu.g++.4 ← log.comb.Cu.1Feb14.linux.4}
	A			examples/comb/log.15May15.comb.Cu2O.elastic.g++.1
	A			examples/comb/log.15May15.comb.Cu2O.elastic.g++.4
	V			examples/comb/{log.15May15.comb.HfO2.g++.1 ← log.comb.HfO2.1Feb14.linux.1}
	V			examples/comb/{log.15May15.comb.HfO2.g++.4 ← log.comb.HfO2.1Feb14.linux.4}
	A			examples/comb/log.15May15.comb.Si.elastic.g++.1
	A			examples/comb/log.15May15.comb.Si.elastic.g++.4
	V			examples/comb/{log.15May15.comb.Si.g++.1 ← log.comb.Si.1Feb14.linux.1}
	V			examples/comb/{log.15May15.comb.Si.g++.4 ← log.comb.Si.1Feb14.linux.4}
	A			examples/comb/log.15May15.comb3.g++.1
	A			examples/comb/log.15May15.comb3.g++.4
	V			examples/comb/{log.comb.Cu.1Feb14.linux.1 → log.15May15.comb.Cu.g++.1}
	V			examples/comb/{log.comb.Cu.1Feb14.linux.4 → log.15May15.comb.Cu.g++.4}
	D			examples/comb/log.comb.Cu2O.elastic.1Feb14.linux.1
	D			examples/comb/log.comb.Cu2O.elastic.1Feb14.linux.4
	V			examples/comb/{log.comb.HfO2.1Feb14.linux.1 → log.15May15.comb.HfO2.g++.1}
	V			examples/comb/{log.comb.HfO2.1Feb14.linux.4 → log.15May15.comb.HfO2.g++.4}
	V			examples/comb/{log.comb.Si.1Feb14.linux.1 → log.15May15.comb.Si.g++.1}
	V			examples/comb/{log.comb.Si.1Feb14.linux.4 → log.15May15.comb.Si.g++.4}
	D			examples/comb/log.comb.Si.elastic.1Feb14.linux.1
	D			examples/comb/log.comb.Si.elastic.1Feb14.linux.4
	D			examples/comb/log.comb3.1Feb14.linux.1
	D			examples/comb/log.comb3.1Feb14.linux.4
	V			examples/crack/{log.15May15.crack.g++.1 ← log.crack.1Feb14.linux.1}
	V			examples/crack/{log.15May15.crack.g++.4 ← log.crack.1Feb14.linux.4}
	V			examples/crack/{log.crack.1Feb14.linux.1 → log.15May15.crack.g++.1}
	V			examples/crack/{log.crack.1Feb14.linux.4 → log.15May15.crack.g++.4}
	A			examples/deposit/log.15May15.deposit.atom.g++.1
	A			examples/deposit/log.15May15.deposit.atom.g++.4
	A			examples/deposit/log.15May15.deposit.molecule.g++.1
	A			examples/deposit/log.15May15.deposit.molecule.g++.4
	A			examples/deposit/log.15May15.deposit.molecule.shake.g++.1
	A			examples/deposit/log.15May15.deposit.molecule.shake.g++.4
	A			examples/dipole/log.15May15.dipole.g++.1
	A			examples/dipole/log.15May15.dipole.g++.4
	D			examples/dipole/log.dipole.1Feb14.linux.1
	D			examples/dipole/log.dipole.1Feb14.linux.4
	V			examples/dreiding/{log.15May15.dreiding.g++.1 ← log.dreiding.1Feb14.linux.1}
	V			examples/dreiding/{log.15May15.dreiding.g++.4 ← log.dreiding.1Feb14.linux.4}
	V			examples/dreiding/{log.dreiding.1Feb14.linux.1 → log.15May15.dreiding.g++.1}
	V			examples/dreiding/{log.dreiding.1Feb14.linux.4 → log.15May15.dreiding.g++.4}
	V			examples/eim/{log.15May15.eim.g++.1 ← log.eim.1Feb14.linux.1}
	V			examples/eim/{log.15May15.eim.g++.4 ← log.eim.1Feb14.linux.4}
	V			examples/eim/{log.eim.1Feb14.linux.1 → log.15May15.eim.g++.1}
	V			examples/eim/{log.eim.1Feb14.linux.4 → log.15May15.eim.g++.4}
	A			examples/ellipse/log.15May15.ellipse.gayberne.g++.1
	A			examples/ellipse/log.15May15.ellipse.gayberne.g++.4
	A			examples/ellipse/log.15May15.ellipse.resquared.g++.1
	A			examples/ellipse/log.15May15.ellipse.resquared.g++.4
	D			examples/ellipse/log.ellipse.gayberne.1Feb14.linux.1
	D			examples/ellipse/log.ellipse.gayberne.1Feb14.linux.4
	D			examples/ellipse/log.ellipse.resquared.1Feb14.linux.1
	D			examples/ellipse/log.ellipse.resquared.1Feb14.linux.4
	V			examples/flow/{log.15May15.flow.couette.g++.1 ← log.flow.couette.1Feb14.linux.1}
	V			examples/flow/{log.15May15.flow.couette.g++.4 ← log.flow.couette.1Feb14.linux.4}
	V			examples/flow/{log.15May15.flow.pois.g++.1 ← log.flow.pois.1Feb14.linux.1}
	V			examples/flow/{log.15May15.flow.pois.g++.4 ← log.flow.pois.1Feb14.linux.4}
	V			examples/flow/{log.flow.couette.1Feb14.linux.1 → log.15May15.flow.couette.g++.1}
	V			examples/flow/{log.flow.couette.1Feb14.linux.4 → log.15May15.flow.couette.g++.4}
	V			examples/flow/{log.flow.pois.1Feb14.linux.1 → log.15May15.flow.pois.g++.1}
	V			examples/flow/{log.flow.pois.1Feb14.linux.4 → log.15May15.flow.pois.g++.4}
	V			examples/friction/{log.15May15.friction.g++.1 ← log.friction.1Feb14.linux.1}
	V			examples/friction/{log.15May15.friction.g++.4 ← log.friction.1Feb14.linux.4}
	V			examples/friction/{log.friction.1Feb14.linux.1 → log.15May15.friction.g++.1}
	V			examples/friction/{log.friction.1Feb14.linux.4 → log.15May15.friction.g++.4}
	V			examples/hugoniostat/{log.15May15.hugoniostat.g++.1 ← log.hugoniostat.1Feb14.linux.1}
	V			examples/hugoniostat/{log.15May15.hugoniostat.g++.4 ← log.hugoniostat.1Feb14.linux.4}
	V			examples/hugoniostat/{log.hugoniostat.1Feb14.linux.1 → log.15May15.hugoniostat.g++.1}
	V			examples/hugoniostat/{log.hugoniostat.1Feb14.linux.4 → log.15May15.hugoniostat.g++.4}
	A			examples/indent/log.15May15.indent.g++.1
	A			examples/indent/log.15May15.indent.g++.4
	A			examples/indent/log.15May15.indent.min.g++.1
	A			examples/indent/log.15May15.indent.min.g++.4
	D			examples/indent/log.indent.1Feb14.linux.1
	D			examples/indent/log.indent.1Feb14.linux.4
	D			examples/indent/log.indent.min.1Feb14.linux.1
	D			examples/indent/log.indent.min.1Feb14.linux.4
	V			examples/meam/{log.15May15.meam.icc.1 ← log.meam.1Feb14.linux.1}
	V			examples/meam/{log.15May15.meam.icc.4 ← log.meam.1Feb14.linux.4}
	V			examples/meam/{log.15May15.meam.shear.icc.1 ← log.meam.shear.1Feb14.linux.1}
	V			examples/meam/{log.15May15.meam.shear.icc.4 ← log.meam.shear.1Feb14.linux.4}
	V			examples/meam/{log.meam.1Feb14.linux.1 → log.15May15.meam.icc.1}
	V			examples/meam/{log.meam.1Feb14.linux.4 → log.15May15.meam.icc.4}
	V			examples/meam/{log.meam.shear.1Feb14.linux.1 → log.15May15.meam.shear.icc.1}
	V			examples/meam/{log.meam.shear.1Feb14.linux.4 → log.15May15.meam.shear.icc.4}
	V			examples/melt/{log.15May15.melt.g++.1 ← log.melt.1Feb14.linux.1}
	V			examples/melt/{log.15May15.melt.g++.4 ← log.melt.1Feb14.linux.4}
	V			examples/melt/{log.melt.1Feb14.linux.1 → log.15May15.melt.g++.1}
	V			examples/melt/{log.melt.1Feb14.linux.4 → log.15May15.melt.g++.4}
	A			examples/micelle/log.15May15.micelle.g++.1
	A			examples/micelle/log.15May15.micelle.g++.4
	D			examples/micelle/log.micelle.1Feb14.linux.1
	D			examples/micelle/log.micelle.1Feb14.linux.4
	A			examples/min/log.15May15.min.box.g++.1
	A			examples/min/log.15May15.min.box.g++.4
	A			examples/min/log.15May15.min.g++.1
	A			examples/min/log.15May15.min.g++.4
	D			examples/min/log.min.1Feb14.linux.1
	D			examples/min/log.min.1Feb14.linux.4
	D			examples/min/log.min.box.1Feb14.linux.1
	D			examples/min/log.min.box.1Feb14.linux.4
	V			examples/msst/{log.15May15.msst.g++.1 ← log.msst.1Feb14.linux.1}
	V			examples/msst/{log.15May15.msst.g++.4 ← log.msst.1Feb14.linux.4}
	V			examples/msst/{log.msst.1Feb14.linux.1 → log.15May15.msst.g++.1}
	V			examples/msst/{log.msst.1Feb14.linux.4 → log.15May15.msst.g++.4}
	V			examples/nb3b/{log.15May15.nb3b.g++.1 ← log.nb3b.1Feb14.linux.1}
	V			examples/nb3b/{log.15May15.nb3b.g++.4 ← log.nb3b.1Feb14.linux.4}
	V			examples/nb3b/{log.nb3b.1Feb14.linux.1 → log.15May15.nb3b.g++.1}
	V			examples/nb3b/{log.nb3b.1Feb14.linux.4 → log.15May15.nb3b.g++.4}
	A			examples/nemd/log.15May15.nemd.g++.1
	A			examples/nemd/log.15May15.nemd.g++.4
	D			examples/nemd/log.nemd.1Feb14.linux.1
	D			examples/nemd/log.nemd.1Feb14.linux.4
	A			examples/obstacle/log.15May15.obstacle.g++.1
	A			examples/obstacle/log.15May15.obstacle.g++.4
	D			examples/obstacle/log.obstacle.1Feb14.linux.1
	D			examples/obstacle/log.obstacle.1Feb14.linux.4
	V			examples/peptide/{log.15May15.peptide.g++.1 ← log.peptide.1Feb14.linux.1}
	V			examples/peptide/{log.15May15.peptide.g++.4 ← log.peptide.1Feb14.linux.4}
	V			examples/peptide/{log.peptide.1Feb14.linux.1 → log.15May15.peptide.g++.1}
	V			examples/peptide/{log.peptide.1Feb14.linux.4 → log.15May15.peptide.g++.4}
	V			examples/peri/{log.15May15.peri.g++.1 ← log.peri.1Feb14.linux.1}
	V			examples/peri/{log.15May15.peri.g++.4 ← log.peri.1Feb14.linux.4}
	V			examples/peri/{log.peri.1Feb14.linux.1 → log.15May15.peri.g++.1}
	V			examples/peri/{log.peri.1Feb14.linux.4 → log.15May15.peri.g++.4}
	V			examples/pour/{log.15May15.pour.2d.g++.1 ← log.pour.2d.1Feb14.linux.1}
	V			examples/pour/{log.15May15.pour.2d.g++.4 ← log.pour.2d.1Feb14.linux.4}
	A			examples/pour/log.15May15.pour.2d.molecule.g++.1
	A			examples/pour/log.15May15.pour.2d.molecule.g++.4
	A			examples/pour/log.15May15.pour.g++.1
	A			examples/pour/log.15May15.pour.g++.4
	D			examples/pour/log.pour.1Feb14.linux.1
	D			examples/pour/log.pour.1Feb14.linux.4
	V			examples/pour/{log.pour.2d.1Feb14.linux.1 → log.15May15.pour.2d.g++.1}
	V			examples/pour/{log.pour.2d.1Feb14.linux.4 → log.15May15.pour.2d.g++.4}
	D			examples/pour/log.pour.2d.molecule.1Feb14.linux.1
	D			examples/pour/log.pour.2d.molecule.1Feb14.linux.4
	V			examples/qeq/{log.15May15.qeq.buck.g++.1 ← log.qeq.buck.8Sep14.linux.1}
	V			examples/qeq/{log.15May15.qeq.buck.g++.4 ← log.qeq.buck.8Sep14.linux.4}
	V			examples/qeq/{log.15May15.qeq.reaxc.g++.1 ← log.qeq.reaxc.8Sep14.linux.1}
	V			examples/qeq/{log.15May15.qeq.reaxc.g++.4 ← log.qeq.reaxc.8Sep14.linux.4}
	V			examples/qeq/{log.qeq.buck.8Sep14.linux.1 → log.15May15.qeq.buck.g++.1}
	V			examples/qeq/{log.qeq.buck.8Sep14.linux.4 → log.15May15.qeq.buck.g++.4}
	V			examples/qeq/{log.qeq.reaxc.8Sep14.linux.1 → log.15May15.qeq.reaxc.g++.1}
	V			examples/qeq/{log.qeq.reaxc.8Sep14.linux.4 → log.15May15.qeq.reaxc.g++.4}
	A			examples/reax/log.15May15.reax.rdx.g++.1
	A			examples/reax/log.15May15.reax.rdx.g++.4
	V			examples/reax/{log.15May15.reax.tatb.g++.1 ← log.reax.tatb.1Feb14.linux.1}
	V			examples/reax/{log.15May15.reax.tatb.g++.4 ← log.reax.tatb.1Feb14.linux.4}
	A			examples/reax/log.15May15.reaxc.rdx.g++.1
	A			examples/reax/log.15May15.reaxc.rdx.g++.4
	V			examples/reax/{log.15May15.reaxc.tatb.g++.1 ← log.reaxc.tatb.1Feb14.linux.1}
	V			examples/reax/{log.15May15.reaxc.tatb.g++.4 ← log.reaxc.tatb.1Feb14.linux.4}
	D			examples/reax/log.reax.rdx.1Feb14.linux.1
	D			examples/reax/log.reax.rdx.1Feb14.linux.4
	V			examples/reax/{log.reax.tatb.1Feb14.linux.1 → log.15May15.reax.tatb.g++.1}
	V			examples/reax/{log.reax.tatb.1Feb14.linux.4 → log.15May15.reax.tatb.g++.4}
	D			examples/reax/log.reaxc.rdx.1Feb14.linux.1
	D			examples/reax/log.reaxc.rdx.1Feb14.linux.4
	V			examples/reax/{log.reaxc.tatb.1Feb14.linux.1 → log.15May15.reaxc.tatb.g++.1}
	V			examples/reax/{log.reaxc.tatb.1Feb14.linux.4 → log.15May15.reaxc.tatb.g++.4}
	V			examples/rigid/{log.15May15.rigid.g++.1 ← log.rigid.1Feb14.linux.1}
	V			examples/rigid/{log.15May15.rigid.g++.4 ← log.rigid.1Feb14.linux.4}
	A			examples/rigid/log.15May15.rigid.poems.g++.1
	A			examples/rigid/log.15May15.rigid.poems.g++.4
	A			examples/rigid/log.15May15.rigid.poems2.g++.1
	A			examples/rigid/log.15May15.rigid.poems2.g++.4
	A			examples/rigid/log.15May15.rigid.tnr.g++.1
	A			examples/rigid/log.15May15.rigid.tnr.g++.4
	V			examples/rigid/{log.rigid.1Feb14.linux.1 → log.15May15.rigid.g++.1}
	V			examples/rigid/{log.rigid.1Feb14.linux.4 → log.15May15.rigid.g++.4}
	D			examples/rigid/log.rigid.poems.1Feb14.linux.1
	D			examples/rigid/log.rigid.poems.1Feb14.linux.4
	D			examples/rigid/log.rigid.poems2.1Feb14.linux.1
	D			examples/rigid/log.rigid.poems2.1Feb14.linux.4
	D			examples/rigid/log.rigid.tnr.1Feb14.linux.1
	D			examples/rigid/log.rigid.tnr.1Feb14.linux.4
	V			examples/shear/{log.15May15.shear.g++.1 ← log.shear.1Feb14.linux.1}
	V			examples/shear/{log.15May15.shear.g++.4 ← log.shear.1Feb14.linux.4}
	V			examples/shear/{log.15May15.shear.void.g++.1 ← log.shear.void.1Feb14.linux.1}
	V			examples/shear/{log.15May15.shear.void.g++.4 ← log.shear.void.1Feb14.linux.4}
	V			examples/shear/{log.shear.1Feb14.linux.1 → log.15May15.shear.g++.1}
	V			examples/shear/{log.shear.1Feb14.linux.4 → log.15May15.shear.g++.4}
	V			examples/shear/{log.shear.void.1Feb14.linux.1 → log.15May15.shear.void.g++.1}
	V			examples/shear/{log.shear.void.1Feb14.linux.4 → log.15May15.shear.void.g++.4}
	V			examples/snap/{log.15May15.snap.g++.1 ← log.snap.5Sep14.linux.1}
	V			examples/snap/{log.15May15.snap.g++.4 ← log.snap.5Sep14.linux.4}
	V			examples/snap/{log.snap.5Sep14.linux.1 → log.15May15.snap.g++.1}
	V			examples/snap/{log.snap.5Sep14.linux.4 → log.15May15.snap.g++.4}
	A			examples/srd/log.15May15.srd.mixture.g++.1
	A			examples/srd/log.15May15.srd.mixture.g++.4
	V			examples/srd/{log.15May15.srd.pure.g++.1 ← log.srd.pure.1Feb14.linux.1}
	V			examples/srd/{log.15May15.srd.pure.g++.4 ← log.srd.pure.1Feb14.linux.4}
	D			examples/srd/log.srd.mixture.1Feb14.linux.1
	D			examples/srd/log.srd.mixture.1Feb14.linux.4
	V			examples/srd/{log.srd.pure.1Feb14.linux.1 → log.15May15.srd.pure.g++.1}
	V			examples/srd/{log.srd.pure.1Feb14.linux.4 → log.15May15.srd.pure.g++.4}
	V			examples/streitz/{log.15May15.streitz.ewald.g++.1 ← log.streitz.ewald.19Feb15.linux.1}
	V			examples/streitz/{log.15May15.streitz.ewald.g++.4 ← log.streitz.ewald.19Feb15.linux.4}
	V			examples/streitz/{log.15May15.streitz.wolf.g++.1 ← log.streitz.wolf.19Feb15.linux.1}
	V			examples/streitz/{log.15May15.streitz.wolf.g++.4 ← log.streitz.wolf.19Feb15.linux.4}
	V			examples/streitz/{log.streitz.ewald.19Feb15.linux.1 → log.15May15.streitz.ewald.g++.1}
	V			examples/streitz/{log.streitz.ewald.19Feb15.linux.4 → log.15May15.streitz.ewald.g++.4}
	V			examples/streitz/{log.streitz.wolf.19Feb15.linux.1 → log.15May15.streitz.wolf.g++.1}
	V			examples/streitz/{log.streitz.wolf.19Feb15.linux.4 → log.15May15.streitz.wolf.g++.4}
	A			examples/voronoi/log.15May15.voronoi.g++.1
	A			examples/voronoi/log.15May15.voronoi.g++.4
	M			src/MC/fix_gcmc.cpp
	M			src/MC/fix_gcmc.h
	M			src/Make.py
	M			src/domain.cpp
	M			src/domain.h
	M			src/version.h