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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 16 2016, 12:44.

Description

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

Resolved Conflicts:
doc/Eqs/improper_dist-1.jpg
doc/Eqs/pair_mdf-1.jpg
doc/Eqs/pair_mdf-2.jpg
doc/Eqs/pair_mdf-3.jpg
doc/Eqs/pair_mdf-4.jpg
doc/Eqs/pair_mdf-5.jpg
doc/Eqs/pair_mdf-6.jpg
doc/Manual.html
doc/Manual.txt
doc/Section_commands.txt
doc/dump_custom_vtk.txt
doc/fix.txt
lib/vtk/Makefile.lammps
python/lammps.py
src/Makefile
src/USER-COLVARS/ndx_group.cpp
src/USER-VTK/dump_custom_vtk.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 16 2016, 12:44

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSabe869aaed3f: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14644 f3b2605a-c512-4ea7…
rLAMMPS872c75754fce: fix typos: pacakge -> package

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1d9d6f924170: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 16 2016, 12:44

Merged Changes

Commit	Author	Details	Committed
abe869aaed3f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14644 f3b2605a-c512-4ea7…	Feb 16 2016
319762c37f30	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14643 f3b2605a-c512-4ea7…	Feb 16 2016
40952680d812	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14642 f3b2605a-c512-4ea7…	Feb 16 2016
33113808012c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14639 f3b2605a-c512-4ea7…	Feb 16 2016
1abf6d03bc33	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14638 f3b2605a-c512-4ea7…	Feb 16 2016
d242d3b6c4c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14636 f3b2605a-c512-4ea7…	Feb 15 2016
ae788f1bdc8b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14635 f3b2605a-c512-4ea7…	Feb 15 2016
9b32dcb314dd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14634 f3b2605a-c512-4ea7…	Feb 15 2016
53b3a4aec002	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14633 f3b2605a-c512-4ea7…	Feb 15 2016
52ca6416a08c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14632 f3b2605a-c512-4ea7…	Feb 15 2016
21136ae10745	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14631 f3b2605a-c512-4ea7…	Feb 15 2016
490b26ed0643	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14630 f3b2605a-c512-4ea7…	Feb 15 2016
952671afd6c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14629 f3b2605a-c512-4ea7…	Feb 15 2016
7512821dd62a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14628 f3b2605a-c512-4ea7…	Feb 15 2016
507bde5b5a92	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14627 f3b2605a-c512-4ea7…	Feb 15 2016
ed9e16202518	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14626 f3b2605a-c512-4ea7…	Feb 15 2016
74d9b4656aca	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14624 f3b2605a-c512-4ea7…	Feb 15 2016
0be549d08f18	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14622 f3b2605a-c512-4ea7…	Feb 15 2016
384d5103dd30	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14621 f3b2605a-c512-4ea7…	Feb 15 2016
c43da51b44f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14620 f3b2605a-c512-4ea7…	Feb 15 2016
531cd5fe2cd9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14619 f3b2605a-c512-4ea7…	Feb 15 2016
e77d1d2ad2a3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14618 f3b2605a-c512-4ea7…	Feb 15 2016
2d43f007d11e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14617 f3b2605a-c512-4ea7…	Feb 15 2016
9ac8547feba2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14616 f3b2605a-c512-4ea7…	Feb 15 2016
e7eced3711eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14615 f3b2605a-c512-4ea7…	Feb 15 2016
9fc1ec8d309b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14614 f3b2605a-c512-4ea7…	Feb 15 2016
2ed186132013	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14613 f3b2605a-c512-4ea7…	Feb 15 2016
be035371f95a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14612 f3b2605a-c512-4ea7…	Feb 15 2016
701b4a00a1af	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14611 f3b2605a-c512-4ea7…	Feb 15 2016
bee7ffaee535	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14610 f3b2605a-c512-4ea7…	Feb 15 2016
b1922ae7ca2a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14609 f3b2605a-c512-4ea7…	Feb 15 2016
77fe3db02c7b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14608 f3b2605a-c512-4ea7…	Feb 15 2016
85a60a9415d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14607 f3b2605a-c512-4ea7…	Feb 15 2016
de853a373b3e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14605 f3b2605a-c512-4ea7…	Feb 15 2016
9d46c0b93860	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14604 f3b2605a-c512-4ea7…	Feb 15 2016
468ef144d450	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14602 f3b2605a-c512-4ea7…	Feb 15 2016
5cd677f3697f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14601 f3b2605a-c512-4ea7…	Feb 15 2016
6a5d853c5dd9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14600 f3b2605a-c512-4ea7…	Feb 15 2016
53f083308803	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14599 f3b2605a-c512-4ea7…	Feb 15 2016
3db8850f0992	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14598 f3b2605a-c512-4ea7…	Feb 15 2016
e98647efb20f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14597 f3b2605a-c512-4ea7…	Feb 15 2016
d615b660c1bd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14596 f3b2605a-c512-4ea7…	Feb 15 2016
e813620f2406	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14595 f3b2605a-c512-4ea7…	Feb 15 2016
4e42c28f66e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14594 f3b2605a-c512-4ea7…	Feb 15 2016
cd14e4314d08	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14593 f3b2605a-c512-4ea7…	Feb 15 2016
a70623ee430f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14592 f3b2605a-c512-4ea7…	Feb 15 2016
729ba2cc21d4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14590 f3b2605a-c512-4ea7…	Feb 15 2016
70aa37e4c852	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14589 f3b2605a-c512-4ea7…	Feb 15 2016

Changes (694)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
V		bench/{log.15Feb16.chain.fixed.icc.1 ← log.15May15.chain.fixed.icc.1}
V		bench/{log.15Feb16.chain.fixed.icc.4 ← log.15May15.chain.fixed.icc.4}
V		bench/{log.15Feb16.chain.scaled.icc.4 ← log.15May15.chain.scaled.icc.4}
V		bench/{log.15Feb16.chute.fixed.icc.1 ← log.15May15.chute.fixed.icc.1}
V		bench/{log.15Feb16.chute.fixed.icc.4 ← log.15May15.chute.fixed.icc.4}
V		bench/{log.15Feb16.chute.scaled.icc.4 ← log.15May15.chute.scaled.icc.4}
V		bench/{log.15Feb16.eam.fixed.icc.1 ← log.15May15.eam.fixed.icc.1}
V		bench/{log.15Feb16.eam.fixed.icc.4 ← log.15May15.eam.fixed.icc.4}
V		bench/{log.15Feb16.eam.scaled.icc.4 ← log.15May15.eam.scaled.icc.4}
V		bench/{log.15Feb16.lj.fixed.icc.1 ← log.15May15.lj.fixed.icc.1}
V		bench/{log.15Feb16.lj.fixed.icc.4 ← log.15May15.lj.fixed.icc.4}
V		bench/{log.15Feb16.lj.scaled.icc.4 ← log.15May15.lj.scaled.icc.4}
V		bench/{log.15Feb16.rhodo.fixed.icc.1 ← log.15May15.rhodo.fixed.icc.1}
V		bench/{log.15Feb16.rhodo.fixed.icc.4 ← log.15May15.rhodo.fixed.icc.4}
V		bench/{log.15Feb16.rhodo.scaled.icc.4 ← log.15May15.rhodo.scaled.icc.4}
V		bench/{log.15May15.chain.fixed.icc.1 → log.15Feb16.chain.fixed.icc.1}
V		bench/{log.15May15.chain.fixed.icc.4 → log.15Feb16.chain.fixed.icc.4}
V		bench/{log.15May15.chain.scaled.icc.4 → log.15Feb16.chain.scaled.icc.4}
V		bench/{log.15May15.chute.fixed.icc.1 → log.15Feb16.chute.fixed.icc.1}
V		bench/{log.15May15.chute.fixed.icc.4 → log.15Feb16.chute.fixed.icc.4}
V		bench/{log.15May15.chute.scaled.icc.4 → log.15Feb16.chute.scaled.icc.4}
V		bench/{log.15May15.eam.fixed.icc.1 → log.15Feb16.eam.fixed.icc.1}
V		bench/{log.15May15.eam.fixed.icc.4 → log.15Feb16.eam.fixed.icc.4}
V		bench/{log.15May15.eam.scaled.icc.4 → log.15Feb16.eam.scaled.icc.4}
V		bench/{log.15May15.lj.fixed.icc.1 → log.15Feb16.lj.fixed.icc.1}
V		bench/{log.15May15.lj.fixed.icc.4 → log.15Feb16.lj.fixed.icc.4}
V		bench/{log.15May15.lj.scaled.icc.4 → log.15Feb16.lj.scaled.icc.4}
V		bench/{log.15May15.rhodo.fixed.icc.1 → log.15Feb16.rhodo.fixed.icc.1}
V		bench/{log.15May15.rhodo.fixed.icc.4 → log.15Feb16.rhodo.fixed.icc.4}
V		bench/{log.15May15.rhodo.scaled.icc.4 → log.15Feb16.rhodo.scaled.icc.4}
M		doc/Eqs/cna_cutoff1.tex
M		doc/Eqs/cna_cutoff2.tex
M		doc/Eqs/eff_ECP1.tex
M		doc/Eqs/eff_ECP2.tex
M		doc/Eqs/fix_wall_lj1043.tex
M		doc/Eqs/heat_flux_k.tex
M		doc/Eqs/improper_dist-1.jpg
A		doc/Eqs/improper_dist-1.tex
M		doc/Eqs/pair_comb1.tex
M		doc/Eqs/pair_comb2.tex
M		doc/Eqs/pair_mdf-1.jpg
A		doc/Eqs/pair_mdf-1.tex
M		doc/Eqs/pair_mdf-2.jpg
A		doc/Eqs/pair_mdf-2.tex
M		doc/Eqs/pair_mdf-3.jpg
A		doc/Eqs/pair_mdf-3.tex
M		doc/Eqs/pair_mdf-4.jpg
A		doc/Eqs/pair_mdf-4.tex
M		doc/Eqs/pair_mdf-5.jpg
A		doc/Eqs/pair_mdf-5.tex
M		doc/Eqs/pair_mdf-6.jpg
A		doc/Eqs/pair_mdf-6.tex
M		doc/Manual.html
M		doc/Manual.pdf
M		doc/Manual.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_errors.html
M		doc/Section_errors.txt
M		doc/Section_python.html
M		doc/Section_python.txt
M		doc/_sources/Manual.txt
M		doc/_sources/Section_commands.txt
M		doc/_sources/Section_errors.txt
M		doc/_sources/Section_python.txt
M		doc/_sources/angle_harmonic.txt
M		doc/_sources/compute.txt
M		doc/_sources/dihedral_harmonic.txt
M		doc/_sources/dihedral_opls.txt
M		doc/_sources/dump.txt
A		doc/_sources/dump_custom_vtk.txt
M		doc/_sources/fix.txt
M		doc/_sources/fix_nh.txt
M		doc/_sources/fix_nvt_sllod.txt
M		doc/_sources/fix_wall_region.txt
M		doc/_sources/group2ndx.txt
M		doc/_sources/improper_cvff.txt
D		doc/_sources/pair_body_rounded_polygon.txt
M		doc/_sources/pair_mdf.txt
M		doc/angle_harmonic.html
M		doc/angle_harmonic.txt
M		doc/body.html
M		doc/compute.html
M		doc/compute.txt
M		doc/dihedral_harmonic.html
M		doc/dihedral_harmonic.txt
M		doc/dihedral_opls.html
M		doc/dihedral_opls.txt
M		doc/dump.html
M		doc/dump.txt
A		doc/dump_custom_vtk.html
M		doc/dump_custom_vtk.txt
M		doc/fix.html
M		doc/fix.txt
M		doc/fix_nh.html
M		doc/fix_nh.txt
P		doc/fix_nph_body.html Copied from doc/fix_nvt_sllod.html
A		doc/fix_nph_body.txt
P		doc/fix_npt_body.html Copied from doc/fix_nvt_sllod.html
A		doc/fix_npt_body.txt
P		doc/fix_nvt_body.html Copied from doc/fix_nvt_sllod.html
P		doc/fix_nvt_body.txt Copied from doc/fix_nvt_sllod.txt
P		doc/fix_nvt_sllod.html Copied to multiple locations: doc/fix_nph_body.html doc/fix_npt_body.html doc/fix_nvt_body.html
P		doc/fix_nvt_sllod.txt Copied to doc/fix_nvt_body.txt
M		doc/fix_wall_region.html
M		doc/fix_wall_region.txt
M		doc/genindex.html
M		doc/group2ndx.html
M		doc/improper_cvff.html
M		doc/improper_cvff.txt
M		doc/improper_distance.html
D		doc/pair_body_rounded_polygon.html
D		doc/pair_body_rounded_polygon.txt
M		doc/pair_mdf.html
M		doc/pair_mdf.txt
M		doc/searchindex.js
V	(dir)	examples/USER/{gauss-diel/ → misc/gauss-diel}
V		examples/USER/{ → misc}/gauss-diel/data.gauss-diel
V		examples/USER/{ → misc}/gauss-diel/in.gauss-diel
V		examples/USER/{ → misc}/gauss-diel/in.gauss-diel-cg
V		examples/USER/{ → misc}/gauss-diel/in.gauss-diel-split
V		examples/USER/{ → misc}/gauss-diel/log.gauss-diel
V		examples/USER/{ → misc}/gauss-diel/log.gauss-diel-cg
V		examples/USER/{ → misc}/gauss-diel/log.gauss-diel-split
V	(dir)	examples/USER/{gle/ → misc/gle}
V		examples/USER/{ → misc}/gle/data.h2o-quantum
V		examples/USER/{ → misc}/gle/data.h2o-smart
V		examples/USER/{ → misc}/gle/in.h2o-quantum
V		examples/USER/{ → misc}/gle/in.h2o-smart
V		examples/USER/{ → misc}/gle/log.h2o-quantum
V		examples/USER/{ → misc}/gle/log.h2o-smart
V		examples/USER/{ → misc}/gle/qt-300k.A
V		examples/USER/{ → misc}/gle/qt-300k.C
V		examples/USER/{ → misc}/gle/smart.A
V	(dir)	examples/USER/{i-pi/ → misc/i-pi}
V		examples/USER/{ → misc}/i-pi/C.opt.tersoff
V		examples/USER/{ → misc}/i-pi/README
V		examples/USER/{ → misc}/i-pi/data.graphene
V		examples/USER/{ → misc}/i-pi/i-pi_input.xml
V		examples/USER/{ → misc}/i-pi/i-pi_positions.xyz
V		examples/USER/{ → misc}/i-pi/in.graphene
V		examples/USER/{ → misc}/imd/README
V		examples/USER/{ → misc}/imd/bucky-plus-cnt-mol.psf
V		examples/USER/{ → misc}/imd/bucky_cnt_imd.vmd
V		examples/USER/{ → misc}/imd/data.bucky-plus-cnt
V		examples/USER/{ → misc}/imd/data.deca-ala-solv
V		examples/USER/{ → misc}/imd/deca-ala-solv.psf
V		examples/USER/{ → misc}/imd/deca-ala-solv_imd-demo.vmd
V		examples/USER/{ → misc}/imd/deca-ala.psf
V		examples/USER/{ → misc}/imd/deca-ala_imd-demo.vmd
V		examples/USER/{ → misc}/imd/falcon.tcl
V		examples/USER/{ → misc}/imd/in.bucky-plus-cnt
V		examples/USER/{ → misc}/imd/in.bucky-plus-cnt-gpu
V		examples/USER/{ → misc}/imd/in.deca-ala-solv-filter_imd
V		examples/USER/{ → misc}/imd/in.deca-ala-solv_imd
V		examples/USER/{ → misc}/imd/in.deca-ala_imd
V		examples/USER/{ → misc}/imd/in.deca-ala_imd-gpu
V		examples/USER/{ → misc}/imd/in.melt_imd
V		examples/USER/{ → misc}/imd/in.melt_imd-gpu
V		examples/USER/{ → misc}/imd/melt.psf
V		examples/USER/{ → misc}/imd/melt_imd-demo.vmd
V	(dir)	examples/USER/{misc/gauss-diel/ ← gauss-diel}
V		examples/USER/{misc ← }/gauss-diel/data.gauss-diel
V		examples/USER/{misc ← }/gauss-diel/in.gauss-diel
V		examples/USER/{misc ← }/gauss-diel/in.gauss-diel-cg
V		examples/USER/{misc ← }/gauss-diel/in.gauss-diel-split
V		examples/USER/{misc ← }/gauss-diel/log.gauss-diel
V		examples/USER/{misc ← }/gauss-diel/log.gauss-diel-cg
V		examples/USER/{misc ← }/gauss-diel/log.gauss-diel-split
V	(dir)	examples/USER/{misc/gle/ ← gle}
V		examples/USER/{misc ← }/gle/data.h2o-quantum
V		examples/USER/{misc ← }/gle/data.h2o-smart
V		examples/USER/{misc ← }/gle/in.h2o-quantum
V		examples/USER/{misc ← }/gle/in.h2o-smart
V		examples/USER/{misc ← }/gle/log.h2o-quantum
V		examples/USER/{misc ← }/gle/log.h2o-smart
V		examples/USER/{misc ← }/gle/qt-300k.A
V		examples/USER/{misc ← }/gle/qt-300k.C
V		examples/USER/{misc ← }/gle/smart.A
V	(dir)	examples/USER/{misc/i-pi/ ← i-pi}
V		examples/USER/{misc ← }/i-pi/C.opt.tersoff
V		examples/USER/{misc ← }/i-pi/README
V		examples/USER/{misc ← }/i-pi/data.graphene
V		examples/USER/{misc ← }/i-pi/i-pi_input.xml
V		examples/USER/{misc ← }/i-pi/i-pi_positions.xyz
V		examples/USER/{misc ← }/i-pi/in.graphene
A	(dir)	examples/USER/misc/imd/
V		examples/USER/{misc ← }/imd/README
V		examples/USER/{misc ← }/imd/bucky-plus-cnt-mol.psf
V		examples/USER/{misc ← }/imd/bucky_cnt_imd.vmd
V		examples/USER/{misc ← }/imd/data.bucky-plus-cnt
V		examples/USER/{misc ← }/imd/data.deca-ala-solv
V		examples/USER/{misc ← }/imd/deca-ala-solv.psf
V		examples/USER/{misc ← }/imd/deca-ala-solv_imd-demo.vmd
V		examples/USER/{misc ← }/imd/deca-ala.psf
V		examples/USER/{misc ← }/imd/deca-ala_imd-demo.vmd
V		examples/USER/{misc ← }/imd/falcon.tcl
V		examples/USER/{misc ← }/imd/in.bucky-plus-cnt
V		examples/USER/{misc ← }/imd/in.bucky-plus-cnt-gpu
V		examples/USER/{misc ← }/imd/in.deca-ala-solv-filter_imd
V		examples/USER/{misc ← }/imd/in.deca-ala-solv_imd
V		examples/USER/{misc ← }/imd/in.deca-ala_imd
V		examples/USER/{misc ← }/imd/in.deca-ala_imd-gpu
V		examples/USER/{misc ← }/imd/in.melt_imd
V		examples/USER/{misc ← }/imd/in.melt_imd-gpu
V		examples/USER/{misc ← }/imd/melt.psf
V		examples/USER/{misc ← }/imd/melt_imd-demo.vmd
V	(dir)	examples/USER/{misc/pimd/ ← pimd}
V	(dir)	examples/USER/{misc/pimd/para-h2/ ← pimd/para-h2}
V		examples/USER/{misc ← }/pimd/para-h2/H2.data
V		examples/USER/{misc ← }/pimd/para-h2/H2.xyz
V		examples/USER/{misc ← }/pimd/para-h2/NM.info
V		examples/USER/{misc ← }/pimd/para-h2/in.scp
V		examples/USER/{misc ← }/pimd/para-h2/pair.table
V		examples/USER/{misc ← }/pimd/para-h2/run.sh
V		examples/USER/{misc ← }/pimd/para-h2/vmd.src
V	(dir)	examples/USER/{misc/pimd/prot-hairpin/ ← pimd/prot-hairpin}
V		examples/USER/{misc ← }/pimd/prot-hairpin/in.scp
V		examples/USER/{misc ← }/pimd/prot-hairpin/run.sh
V		examples/USER/{misc ← }/pimd/prot-hairpin/system.data
V	(dir)	examples/USER/{misc/srp/ ← srp}
V		examples/USER/{misc ← }/srp/data.chain
V		examples/USER/{misc ← }/srp/in.srp
V	(dir)	examples/USER/{pimd/ → misc/pimd}
V	(dir)	examples/USER/{pimd/para-h2/ → misc/pimd/para-h2}
V		examples/USER/{ → misc}/pimd/para-h2/H2.data
V		examples/USER/{ → misc}/pimd/para-h2/H2.xyz
V		examples/USER/{ → misc}/pimd/para-h2/NM.info
V		examples/USER/{ → misc}/pimd/para-h2/in.scp
V		examples/USER/{ → misc}/pimd/para-h2/pair.table
V		examples/USER/{ → misc}/pimd/para-h2/run.sh
V		examples/USER/{ → misc}/pimd/para-h2/vmd.src
V	(dir)	examples/USER/{pimd/prot-hairpin/ → misc/pimd/prot-hairpin}
V		examples/USER/{ → misc}/pimd/prot-hairpin/in.scp
V		examples/USER/{ → misc}/pimd/prot-hairpin/run.sh
V		examples/USER/{ → misc}/pimd/prot-hairpin/system.data
V	(dir)	examples/USER/{srp/ → misc/srp}
V		examples/USER/{ → misc}/srp/data.chain
V		examples/USER/{ → misc}/srp/in.srp
V		examples/balance/{log.15Feb16.balance.bond.fast.g++.1 ← log.15May15.balance.bond.fast.g++.1}
A		examples/balance/log.15Feb16.balance.bond.fast.g++.4
V		examples/balance/{log.15Feb16.balance.bond.slow.g++.1 ← log.15May15.balance.bond.slow.g++.1}
V		examples/balance/{log.15Feb16.balance.bond.slow.g++.4 ← log.15May15.balance.bond.slow.g++.4}
V		examples/balance/{log.15Feb16.balance.g++.1 ← log.15May15.balance.g++.1}
A		examples/balance/log.15Feb16.balance.g++.4
V		examples/balance/{log.15May15.balance.bond.fast.g++.1 → log.15Feb16.balance.bond.fast.g++.1}
D		examples/balance/log.15May15.balance.bond.fast.g++.4
V		examples/balance/{log.15May15.balance.bond.slow.g++.1 → log.15Feb16.balance.bond.slow.g++.1}
V		examples/balance/{log.15May15.balance.bond.slow.g++.4 → log.15Feb16.balance.bond.slow.g++.4}
V		examples/balance/{log.15May15.balance.g++.1 → log.15Feb16.balance.g++.1}
D		examples/balance/log.15May15.balance.g++.4
V		examples/body/{log.15Feb16.body.g++.1 ← log.15May15.body.g++.1}
V		examples/body/{log.15Feb16.body.g++.4 ← log.15May15.body.g++.4}
V		examples/body/{log.15May15.body.g++.1 → log.15Feb16.body.g++.1}
V		examples/body/{log.15May15.body.g++.4 → log.15Feb16.body.g++.4}
V		examples/colloid/{log.15Feb16.colloid.g++.1 ← log.15May15.colloid.g++.1}
V		examples/colloid/{log.15Feb16.colloid.g++.4 ← log.15May15.colloid.g++.4}
V		examples/colloid/{log.15May15.colloid.g++.1 → log.15Feb16.colloid.g++.1}
V		examples/colloid/{log.15May15.colloid.g++.4 → log.15Feb16.colloid.g++.4}
V		examples/comb/{log.15Feb16.comb.Cu.g++.1 ← log.15May15.comb.Cu.g++.1}
V		examples/comb/{log.15Feb16.comb.Cu.g++.4 ← log.15May15.comb.Cu.g++.4}
A		examples/comb/log.15Feb16.comb.Cu2O.elastic.g++.1
A		examples/comb/log.15Feb16.comb.Cu2O.elastic.g++.4
A		examples/comb/log.15Feb16.comb.HfO2.g++.1
A		examples/comb/log.15Feb16.comb.HfO2.g++.4
V		examples/comb/{log.15Feb16.comb.Si.elastic.g++.1 ← log.15May15.comb.Si.elastic.g++.1}
V		examples/comb/{log.15Feb16.comb.Si.elastic.g++.4 ← log.15May15.comb.Si.elastic.g++.4}
V		examples/comb/{log.15Feb16.comb.Si.g++.1 ← log.15May15.comb.Si.g++.1}
V		examples/comb/{log.15Feb16.comb.Si.g++.4 ← log.15May15.comb.Si.g++.4}
A		examples/comb/log.15Feb16.comb3.g++.1
A		examples/comb/log.15Feb16.comb3.g++.4
V		examples/comb/{log.15May15.comb.Cu.g++.1 → log.15Feb16.comb.Cu.g++.1}
V		examples/comb/{log.15May15.comb.Cu.g++.4 → log.15Feb16.comb.Cu.g++.4}
D		examples/comb/log.15May15.comb.Cu2O.elastic.g++.1
D		examples/comb/log.15May15.comb.Cu2O.elastic.g++.4
D		examples/comb/log.15May15.comb.HfO2.g++.1
D		examples/comb/log.15May15.comb.HfO2.g++.4
V		examples/comb/{log.15May15.comb.Si.elastic.g++.1 → log.15Feb16.comb.Si.elastic.g++.1}
V		examples/comb/{log.15May15.comb.Si.elastic.g++.4 → log.15Feb16.comb.Si.elastic.g++.4}
V		examples/comb/{log.15May15.comb.Si.g++.1 → log.15Feb16.comb.Si.g++.1}
V		examples/comb/{log.15May15.comb.Si.g++.4 → log.15Feb16.comb.Si.g++.4}
D		examples/comb/log.15May15.comb3.g++.1
D		examples/comb/log.15May15.comb3.g++.4
V		examples/crack/{log.15Feb16.crack.g++.1 ← log.15May15.crack.g++.1}
V		examples/crack/{log.15Feb16.crack.g++.4 ← log.15May15.crack.g++.4}
V		examples/crack/{log.15May15.crack.g++.1 → log.15Feb16.crack.g++.1}
V		examples/crack/{log.15May15.crack.g++.4 → log.15Feb16.crack.g++.4}
V		examples/deposit/{log.15Feb16.deposit.atom.g++.1 ← log.15May15.deposit.atom.g++.1}
V		examples/deposit/{log.15Feb16.deposit.atom.g++.4 ← log.15May15.deposit.atom.g++.4}
V		examples/deposit/{log.15Feb16.deposit.molecule.g++.1 ← log.15May15.deposit.molecule.g++.1}
V		examples/deposit/{log.15Feb16.deposit.molecule.g++.4 ← log.15May15.deposit.molecule.g++.4}
V		examples/deposit/{log.15Feb16.deposit.molecule.shake.g++.1 ← log.15May15.deposit.molecule.shake.g++.1}
V		examples/deposit/{log.15Feb16.deposit.molecule.shake.g++.4 ← log.15May15.deposit.molecule.shake.g++.4}
V		examples/deposit/{log.15May15.deposit.atom.g++.1 → log.15Feb16.deposit.atom.g++.1}
V		examples/deposit/{log.15May15.deposit.atom.g++.4 → log.15Feb16.deposit.atom.g++.4}
V		examples/deposit/{log.15May15.deposit.molecule.g++.1 → log.15Feb16.deposit.molecule.g++.1}
V		examples/deposit/{log.15May15.deposit.molecule.g++.4 → log.15Feb16.deposit.molecule.g++.4}
V		examples/deposit/{log.15May15.deposit.molecule.shake.g++.1 → log.15Feb16.deposit.molecule.shake.g++.1}
V		examples/deposit/{log.15May15.deposit.molecule.shake.g++.4 → log.15Feb16.deposit.molecule.shake.g++.4}
V		examples/dipole/{log.15Feb16.dipole.g++.1 ← log.15May15.dipole.g++.1}
V		examples/dipole/{log.15Feb16.dipole.g++.4 ← log.15May15.dipole.g++.4}
V		examples/dipole/{log.15May15.dipole.g++.1 → log.15Feb16.dipole.g++.1}
V		examples/dipole/{log.15May15.dipole.g++.4 → log.15Feb16.dipole.g++.4}
V		examples/dreiding/{log.15Feb16.dreiding.g++.1 ← log.15May15.dreiding.g++.1}
V		examples/dreiding/{log.15Feb16.dreiding.g++.4 ← log.15May15.dreiding.g++.4}
V		examples/dreiding/{log.15May15.dreiding.g++.1 → log.15Feb16.dreiding.g++.1}
V		examples/dreiding/{log.15May15.dreiding.g++.4 → log.15Feb16.dreiding.g++.4}
V		examples/eim/{log.15Feb16.eim.g++.1 ← log.15May15.eim.g++.1}
V		examples/eim/{log.15Feb16.eim.g++.4 ← log.15May15.eim.g++.4}
V		examples/eim/{log.15May15.eim.g++.1 → log.15Feb16.eim.g++.1}
V		examples/eim/{log.15May15.eim.g++.4 → log.15Feb16.eim.g++.4}
V		examples/ellipse/{log.15Feb16.ellipse.gayberne.g++.1 ← log.15May15.ellipse.gayberne.g++.1}
V		examples/ellipse/{log.15Feb16.ellipse.gayberne.g++.4 ← log.15May15.ellipse.gayberne.g++.4}
V		examples/ellipse/{log.15Feb16.ellipse.resquared.g++.1 ← log.15May15.ellipse.resquared.g++.1}
V		examples/ellipse/{log.15Feb16.ellipse.resquared.g++.4 ← log.15May15.ellipse.resquared.g++.4}
V		examples/ellipse/{log.15May15.ellipse.gayberne.g++.1 → log.15Feb16.ellipse.gayberne.g++.1}
V		examples/ellipse/{log.15May15.ellipse.gayberne.g++.4 → log.15Feb16.ellipse.gayberne.g++.4}
V		examples/ellipse/{log.15May15.ellipse.resquared.g++.1 → log.15Feb16.ellipse.resquared.g++.1}
V		examples/ellipse/{log.15May15.ellipse.resquared.g++.4 → log.15Feb16.ellipse.resquared.g++.4}
V		examples/flow/{log.15Feb16.flow.couette.g++.1 ← log.15May15.flow.couette.g++.1}
V		examples/flow/{log.15Feb16.flow.couette.g++.4 ← log.15May15.flow.couette.g++.4}
V		examples/flow/{log.15Feb16.flow.pois.g++.1 ← log.15May15.flow.pois.g++.1}
V		examples/flow/{log.15Feb16.flow.pois.g++.4 ← log.15May15.flow.pois.g++.4}
V		examples/flow/{log.15May15.flow.couette.g++.1 → log.15Feb16.flow.couette.g++.1}
V		examples/flow/{log.15May15.flow.couette.g++.4 → log.15Feb16.flow.couette.g++.4}
V		examples/flow/{log.15May15.flow.pois.g++.1 → log.15Feb16.flow.pois.g++.1}
V		examples/flow/{log.15May15.flow.pois.g++.4 → log.15Feb16.flow.pois.g++.4}
V		examples/friction/{log.15Feb16.friction.g++.1 ← log.15May15.friction.g++.1}
V		examples/friction/{log.15Feb16.friction.g++.4 ← log.15May15.friction.g++.4}
V		examples/friction/{log.15May15.friction.g++.1 → log.15Feb16.friction.g++.1}
V		examples/friction/{log.15May15.friction.g++.4 → log.15Feb16.friction.g++.4}
V		examples/hugoniostat/{log.15Feb16.hugoniostat.g++.1 ← log.15May15.hugoniostat.g++.1}
V		examples/hugoniostat/{log.15Feb16.hugoniostat.g++.4 ← log.15May15.hugoniostat.g++.4}
V		examples/hugoniostat/{log.15May15.hugoniostat.g++.1 → log.15Feb16.hugoniostat.g++.1}
V		examples/hugoniostat/{log.15May15.hugoniostat.g++.4 → log.15Feb16.hugoniostat.g++.4}
V		examples/indent/{log.15Feb16.indent.g++.1 ← log.15May15.indent.g++.1}
V		examples/indent/{log.15Feb16.indent.g++.4 ← log.15May15.indent.g++.4}
V		examples/indent/{log.15Feb16.indent.min.g++.1 ← log.15May15.indent.min.g++.1}
V		examples/indent/{log.15Feb16.indent.min.g++.4 ← log.15May15.indent.min.g++.4}
V		examples/indent/{log.15May15.indent.g++.1 → log.15Feb16.indent.g++.1}
V		examples/indent/{log.15May15.indent.g++.4 → log.15Feb16.indent.g++.4}
V		examples/indent/{log.15May15.indent.min.g++.1 → log.15Feb16.indent.min.g++.1}
V		examples/indent/{log.15May15.indent.min.g++.4 → log.15Feb16.indent.min.g++.4}
V		examples/kim/{log.kim.lj.28Jun15.ubuntu.1 ← log.kim.lj.28jun15.ubuntu.1}
V		examples/kim/{log.kim.lj.28Jun15.ubuntu.4 ← log.kim.lj.28jun15.ubuntu.4}
V		examples/kim/{log.kim.lj.28jun15.ubuntu.1 → log.kim.lj.28Jun15.ubuntu.1}
V		examples/kim/{log.kim.lj.28jun15.ubuntu.4 → log.kim.lj.28Jun15.ubuntu.4}
V		examples/kim/{log.kim.lj.lmp.28Jun15.ubuntu.1 ← log.kim.lj.lmp.28jun15.ubuntu.1}
V		examples/kim/{log.kim.lj.lmp.28Jun15.ubuntu.4 ← log.kim.lj.lmp.28jun15.ubuntu.4}
V		examples/kim/{log.kim.lj.lmp.28jun15.ubuntu.1 → log.kim.lj.lmp.28Jun15.ubuntu.1}
V		examples/kim/{log.kim.lj.lmp.28jun15.ubuntu.4 → log.kim.lj.lmp.28Jun15.ubuntu.4}
V		examples/meam/{log.15Feb16.meam.icc.1 ← log.15May15.meam.icc.1}
V		examples/meam/{log.15Feb16.meam.icc.4 ← log.15May15.meam.icc.4}
V		examples/meam/{log.15Feb16.meam.shear.icc.1 ← log.15May15.meam.shear.icc.1}
V		examples/meam/{log.15Feb16.meam.shear.icc.4 ← log.15May15.meam.shear.icc.4}
V		examples/meam/{log.15May15.meam.icc.1 → log.15Feb16.meam.icc.1}
V		examples/meam/{log.15May15.meam.icc.4 → log.15Feb16.meam.icc.4}
V		examples/meam/{log.15May15.meam.shear.icc.1 → log.15Feb16.meam.shear.icc.1}
V		examples/meam/{log.15May15.meam.shear.icc.4 → log.15Feb16.meam.shear.icc.4}
V		examples/melt/{log.15Feb16.melt.g++.1 ← log.15May15.melt.g++.1}
V		examples/melt/{log.15Feb16.melt.g++.4 ← log.15May15.melt.g++.4}
V		examples/melt/{log.15May15.melt.g++.1 → log.15Feb16.melt.g++.1}
V		examples/melt/{log.15May15.melt.g++.4 → log.15Feb16.melt.g++.4}
V		examples/micelle/{log.15Feb16.micelle.g++.1 ← log.15May15.micelle.g++.1}
V		examples/micelle/{log.15Feb16.micelle.g++.4 ← log.15May15.micelle.g++.4}
V		examples/micelle/{log.15May15.micelle.g++.1 → log.15Feb16.micelle.g++.1}
V		examples/micelle/{log.15May15.micelle.g++.4 → log.15Feb16.micelle.g++.4}
V		examples/min/{log.15Feb16.min.box.g++.1 ← log.15May15.min.box.g++.1}
V		examples/min/{log.15Feb16.min.box.g++.4 ← log.15May15.min.box.g++.4}
V		examples/min/{log.15Feb16.min.g++.1 ← log.15May15.min.g++.1}
V		examples/min/{log.15Feb16.min.g++.4 ← log.15May15.min.g++.4}
V		examples/min/{log.15May15.min.box.g++.1 → log.15Feb16.min.box.g++.1}
V		examples/min/{log.15May15.min.box.g++.4 → log.15Feb16.min.box.g++.4}
V		examples/min/{log.15May15.min.g++.1 → log.15Feb16.min.g++.1}
V		examples/min/{log.15May15.min.g++.4 → log.15Feb16.min.g++.4}
V		examples/msst/{log.15Feb16.msst.g++.1 ← log.15May15.msst.g++.1}
V		examples/msst/{log.15Feb16.msst.g++.4 ← log.15May15.msst.g++.4}
V		examples/msst/{log.15May15.msst.g++.1 → log.15Feb16.msst.g++.1}
V		examples/msst/{log.15May15.msst.g++.4 → log.15Feb16.msst.g++.4}
V		examples/nb3b/{log.15Feb16.nb3b.g++.1 ← log.15May15.nb3b.g++.1}
V		examples/nb3b/{log.15Feb16.nb3b.g++.4 ← log.15May15.nb3b.g++.4}
V		examples/nb3b/{log.15May15.nb3b.g++.1 → log.15Feb16.nb3b.g++.1}
V		examples/nb3b/{log.15May15.nb3b.g++.4 → log.15Feb16.nb3b.g++.4}
A		examples/neb/log.15Feb16.neb.hop1.g++.4
A		examples/neb/log.15Feb16.neb.hop2.g++.4
A		examples/neb/log.15Feb16.neb.sivac.g++.3
D		examples/neb/log.neb.hop1.1Feb14.linux.4
D		examples/neb/log.neb.hop2.1Feb14.linux.4
D		examples/neb/log.neb.sivac.1Feb14.linux.3
V		examples/nemd/{log.15Feb16.nemd.g++.1 ← log.15May15.nemd.g++.1}
V		examples/nemd/{log.15Feb16.nemd.g++.4 ← log.15May15.nemd.g++.4}
V		examples/nemd/{log.15May15.nemd.g++.1 → log.15Feb16.nemd.g++.1}
V		examples/nemd/{log.15May15.nemd.g++.4 → log.15Feb16.nemd.g++.4}
V		examples/obstacle/{log.15Feb16.obstacle.g++.1 ← log.15May15.obstacle.g++.1}
V		examples/obstacle/{log.15Feb16.obstacle.g++.4 ← log.15May15.obstacle.g++.4}
V		examples/obstacle/{log.15May15.obstacle.g++.1 → log.15Feb16.obstacle.g++.1}
V		examples/obstacle/{log.15May15.obstacle.g++.4 → log.15Feb16.obstacle.g++.4}
V		examples/peptide/{log.15Feb16.peptide.g++.1 ← log.15May15.peptide.g++.1}
V		examples/peptide/{log.15Feb16.peptide.g++.4 ← log.15May15.peptide.g++.4}
V		examples/peptide/{log.15May15.peptide.g++.1 → log.15Feb16.peptide.g++.1}
V		examples/peptide/{log.15May15.peptide.g++.4 → log.15Feb16.peptide.g++.4}
V		examples/peri/{log.15Feb16.peri.g++.1 ← log.15May15.peri.g++.1}
V		examples/peri/{log.15Feb16.peri.g++.4 ← log.15May15.peri.g++.4}
V		examples/peri/{log.15May15.peri.g++.1 → log.15Feb16.peri.g++.1}
V		examples/peri/{log.15May15.peri.g++.4 → log.15Feb16.peri.g++.4}
V		examples/pour/{log.15Feb16.pour.2d.g++.1 ← log.15May15.pour.2d.g++.1}
V		examples/pour/{log.15Feb16.pour.2d.g++.4 ← log.15May15.pour.2d.g++.4}
V		examples/pour/{log.15Feb16.pour.2d.molecule.g++.1 ← log.15May15.pour.2d.molecule.g++.1}
V		examples/pour/{log.15Feb16.pour.2d.molecule.g++.4 ← log.15May15.pour.2d.molecule.g++.4}
V		examples/pour/{log.15Feb16.pour.g++.1 ← log.15May15.pour.g++.1}
V		examples/pour/{log.15Feb16.pour.g++.4 ← log.15May15.pour.g++.4}
V		examples/pour/{log.15May15.pour.2d.g++.1 → log.15Feb16.pour.2d.g++.1}
V		examples/pour/{log.15May15.pour.2d.g++.4 → log.15Feb16.pour.2d.g++.4}
V		examples/pour/{log.15May15.pour.2d.molecule.g++.1 → log.15Feb16.pour.2d.molecule.g++.1}
V		examples/pour/{log.15May15.pour.2d.molecule.g++.4 → log.15Feb16.pour.2d.molecule.g++.4}
V		examples/pour/{log.15May15.pour.g++.1 → log.15Feb16.pour.g++.1}
V		examples/pour/{log.15May15.pour.g++.4 → log.15Feb16.pour.g++.4}
A		examples/prd/log.15Feb16.prd.g++.4
D		examples/prd/log.prd.0.1Feb14.linux.4
D		examples/prd/log.prd.1.1Feb14.linux.4
D		examples/prd/log.prd.1Feb14.linux.4
D		examples/prd/log.prd.2.1Feb14.linux.4
D		examples/prd/log.prd.3.1Feb14.linux.4
A		examples/qeq/log.15Feb16.qeq.buck.g++.1
A		examples/qeq/log.15Feb16.qeq.buck.g++.4
V		examples/qeq/{log.15Feb16.qeq.reaxc.g++.1 ← log.15May15.qeq.reaxc.g++.1}
V		examples/qeq/{log.15Feb16.qeq.reaxc.g++.4 ← log.15May15.qeq.reaxc.g++.4}
D		examples/qeq/log.15May15.qeq.buck.g++.1
D		examples/qeq/log.15May15.qeq.buck.g++.4
V		examples/qeq/{log.15May15.qeq.reaxc.g++.1 → log.15Feb16.qeq.reaxc.g++.1}
V		examples/qeq/{log.15May15.qeq.reaxc.g++.4 → log.15Feb16.qeq.reaxc.g++.4}
A		examples/reax/AB/log.15Feb16.AB.g++.1
A		examples/reax/AB/log.15Feb16.AB.g++.4
A		examples/reax/AB/log.cite
V		examples/reax/AB/{log.lammps ← log.reaxc.AB.1Feb14.linux.4}
D		examples/reax/AB/log.reaxc.AB.1Feb14.linux.1
V		examples/reax/AB/{log.reaxc.AB.1Feb14.linux.4 → log.lammps}
A		examples/reax/AuO/log.15Feb16.AuO.g++.1
A		examples/reax/AuO/log.15Feb16.AuO.g++.4
D		examples/reax/AuO/log.reaxc.AuO.1Feb14.linux.1
D		examples/reax/AuO/log.reaxc.AuO.1Feb14.linux.4
A		examples/reax/CHO/log.15Feb16.CHO.g++.1
A		examples/reax/CHO/log.15Feb16.CHO.g++.4
D		examples/reax/CHO/log.reaxc.CHO.1Feb14.linux.1
D		examples/reax/CHO/log.reaxc.CHO.1Feb14.linux.4
V		examples/reax/FC/{log.15Feb16.FC.g++.1 ← log.reaxc.FC.1Feb14.linux.1}
V		examples/reax/FC/{log.15Feb16.FC.g++.4 ← log.reaxc.FC.1Feb14.linux.4}
V		examples/reax/FC/{log.reaxc.FC.1Feb14.linux.1 → log.15Feb16.FC.g++.1}
V		examples/reax/FC/{log.reaxc.FC.1Feb14.linux.4 → log.15Feb16.FC.g++.4}
A		examples/reax/FeOH3/log.15Feb16.FeOH3.g++.1
A		examples/reax/FeOH3/log.15Feb16.FeOH3.g++.4
D		examples/reax/FeOH3/log.reaxc.FeOH3.1Feb14.linux.1
D		examples/reax/FeOH3/log.reaxc.FeOH3.1Feb14.linux.4
A		examples/reax/RDX/log.15Feb16.RDX.g++.1
A		examples/reax/RDX/log.15Feb16.RDX.g++.4
D		examples/reax/RDX/log.reaxc.RDX.1Feb14.linux.1
D		examples/reax/RDX/log.reaxc.RDX.1Feb14.linux.4
A		examples/reax/VOH/log.15Feb16.VOH.g++.1
A		examples/reax/VOH/log.15Feb16.VOH.g++.4
D		examples/reax/VOH/log.reaxc.VOH.1Feb14.linux.1
D		examples/reax/VOH/log.reaxc.VOH.1Feb14.linux.4
A		examples/reax/ZnOH2/log.15Feb16.ZnOH2.g++.1
A		examples/reax/ZnOH2/log.15Feb16.ZnOH2.g++.4
D		examples/reax/ZnOH2/log.reaxc.ZnOH2.1Feb14.linux.1
D		examples/reax/ZnOH2/log.reaxc.ZnOH2.1Feb14.linux.4
V		examples/reax/{log.15Feb16.reax.rdx.g++.1 ← log.15May15.reax.rdx.g++.1}
V		examples/reax/{log.15Feb16.reax.rdx.g++.4 ← log.15May15.reax.rdx.g++.4}
V		examples/reax/{log.15Feb16.reax.tatb.g++.1 ← log.15May15.reax.tatb.g++.1}
V		examples/reax/{log.15Feb16.reax.tatb.g++.4 ← log.15May15.reax.tatb.g++.4}
V		examples/reax/{log.15Feb16.reaxc.rdx.g++.1 ← log.15May15.reaxc.rdx.g++.1}
V		examples/reax/{log.15Feb16.reaxc.rdx.g++.4 ← log.15May15.reaxc.rdx.g++.4}
V		examples/reax/{log.15Feb16.reaxc.tatb.g++.1 ← log.15May15.reaxc.tatb.g++.1}
V		examples/reax/{log.15Feb16.reaxc.tatb.g++.4 ← log.15May15.reaxc.tatb.g++.4}
V		examples/reax/{log.15May15.reax.rdx.g++.1 → log.15Feb16.reax.rdx.g++.1}
V		examples/reax/{log.15May15.reax.rdx.g++.4 → log.15Feb16.reax.rdx.g++.4}
V		examples/reax/{log.15May15.reax.tatb.g++.1 → log.15Feb16.reax.tatb.g++.1}
V		examples/reax/{log.15May15.reax.tatb.g++.4 → log.15Feb16.reax.tatb.g++.4}
V		examples/reax/{log.15May15.reaxc.rdx.g++.1 → log.15Feb16.reaxc.rdx.g++.1}
V		examples/reax/{log.15May15.reaxc.rdx.g++.4 → log.15Feb16.reaxc.rdx.g++.4}
V		examples/reax/{log.15May15.reaxc.tatb.g++.1 → log.15Feb16.reaxc.tatb.g++.1}
V		examples/reax/{log.15May15.reaxc.tatb.g++.4 → log.15Feb16.reaxc.tatb.g++.4}
V		examples/rigid/{log.15Feb16.rigid.g++.1 ← log.15May15.rigid.g++.1}
V		examples/rigid/{log.15Feb16.rigid.g++.4 ← log.15May15.rigid.g++.4}
V		examples/rigid/{log.15Feb16.rigid.poems.g++.1 ← log.15May15.rigid.poems.g++.1}
V		examples/rigid/{log.15Feb16.rigid.poems.g++.4 ← log.15May15.rigid.poems.g++.4}
V		examples/rigid/{log.15Feb16.rigid.poems2.g++.1 ← log.15May15.rigid.poems2.g++.1}
V		examples/rigid/{log.15Feb16.rigid.poems2.g++.4 ← log.15May15.rigid.poems2.g++.4}
V		examples/rigid/{log.15Feb16.rigid.tnr.g++.1 ← log.15May15.rigid.tnr.g++.1}
V		examples/rigid/{log.15Feb16.rigid.tnr.g++.4 ← log.15May15.rigid.tnr.g++.4}
V		examples/rigid/{log.15May15.rigid.g++.1 → log.15Feb16.rigid.g++.1}
V		examples/rigid/{log.15May15.rigid.g++.4 → log.15Feb16.rigid.g++.4}
V		examples/rigid/{log.15May15.rigid.poems.g++.1 → log.15Feb16.rigid.poems.g++.1}
V		examples/rigid/{log.15May15.rigid.poems.g++.4 → log.15Feb16.rigid.poems.g++.4}
V		examples/rigid/{log.15May15.rigid.poems2.g++.1 → log.15Feb16.rigid.poems2.g++.1}
V		examples/rigid/{log.15May15.rigid.poems2.g++.4 → log.15Feb16.rigid.poems2.g++.4}
V		examples/rigid/{log.15May15.rigid.tnr.g++.1 → log.15Feb16.rigid.tnr.g++.1}
V		examples/rigid/{log.15May15.rigid.tnr.g++.4 → log.15Feb16.rigid.tnr.g++.4}
V		examples/shear/{log.15Feb16.shear.g++.1 ← log.15May15.shear.g++.1}
V		examples/shear/{log.15Feb16.shear.g++.4 ← log.15May15.shear.g++.4}
V		examples/shear/{log.15Feb16.shear.void.g++.1 ← log.15May15.shear.void.g++.1}
V		examples/shear/{log.15Feb16.shear.void.g++.4 ← log.15May15.shear.void.g++.4}
V		examples/shear/{log.15May15.shear.g++.1 → log.15Feb16.shear.g++.1}
V		examples/shear/{log.15May15.shear.g++.4 → log.15Feb16.shear.g++.4}
V		examples/shear/{log.15May15.shear.void.g++.1 → log.15Feb16.shear.void.g++.1}
V		examples/shear/{log.15May15.shear.void.g++.4 → log.15Feb16.shear.void.g++.4}
V		examples/snap/{log.15Feb16.snap.g++.1 ← log.15May15.snap.g++.1}
V		examples/snap/{log.15Feb16.snap.g++.4 ← log.15May15.snap.g++.4}
V		examples/snap/{log.15May15.snap.g++.1 → log.15Feb16.snap.g++.1}
V		examples/snap/{log.15May15.snap.g++.4 → log.15Feb16.snap.g++.4}
V		examples/srd/{log.15Feb16.srd.mixture.g++.1 ← log.15May15.srd.mixture.g++.1}
V		examples/srd/{log.15Feb16.srd.mixture.g++.4 ← log.15May15.srd.mixture.g++.4}
V		examples/srd/{log.15Feb16.srd.pure.g++.1 ← log.15May15.srd.pure.g++.1}
V		examples/srd/{log.15Feb16.srd.pure.g++.4 ← log.15May15.srd.pure.g++.4}
V		examples/srd/{log.15May15.srd.mixture.g++.1 → log.15Feb16.srd.mixture.g++.1}
V		examples/srd/{log.15May15.srd.mixture.g++.4 → log.15Feb16.srd.mixture.g++.4}
V		examples/srd/{log.15May15.srd.pure.g++.1 → log.15Feb16.srd.pure.g++.1}
V		examples/srd/{log.15May15.srd.pure.g++.4 → log.15Feb16.srd.pure.g++.4}
V		examples/streitz/{log.15Feb16.streitz.ewald.g++.1 ← log.15May15.streitz.ewald.g++.1}
V		examples/streitz/{log.15Feb16.streitz.ewald.g++.4 ← log.15May15.streitz.ewald.g++.4}
V		examples/streitz/{log.15Feb16.streitz.wolf.g++.1 ← log.15May15.streitz.wolf.g++.1}
V		examples/streitz/{log.15Feb16.streitz.wolf.g++.4 ← log.15May15.streitz.wolf.g++.4}
V		examples/streitz/{log.15May15.streitz.ewald.g++.1 → log.15Feb16.streitz.ewald.g++.1}
V		examples/streitz/{log.15May15.streitz.ewald.g++.4 → log.15Feb16.streitz.ewald.g++.4}
V		examples/streitz/{log.15May15.streitz.wolf.g++.1 → log.15Feb16.streitz.wolf.g++.1}
V		examples/streitz/{log.15May15.streitz.wolf.g++.4 → log.15Feb16.streitz.wolf.g++.4}
A		examples/tad/log.15Feb16.tad.g++.3
D		examples/tad/log.tad.0.1Feb14.linux.3
D		examples/tad/log.tad.1.1Feb14.linux.3
D		examples/tad/log.tad.1Feb14.linux.3
D		examples/tad/log.tad.2.1Feb14.linux.3
D		examples/tad/log.tad.neb.1Feb14.linux.3
A		examples/vashishta/log.15Feb16.indiumphosphide.g++.1
A		examples/vashishta/log.15Feb16.indiumphosphide.g++.4
A		examples/vashishta/log.15Feb16.sio2.g++.1
A		examples/vashishta/log.15Feb16.sio2.g++.4
A		examples/voronoi/log.15Feb16.voronoi.2d.g++.1
A		examples/voronoi/log.15Feb16.voronoi.2d.g++.4
A		examples/voronoi/log.15Feb16.voronoi.data.g++.1
A		examples/voronoi/log.15Feb16.voronoi.data.g++.4
V		examples/voronoi/{log.15Feb16.voronoi.g++.1 ← log.15May15.voronoi.g++.1}
V		examples/voronoi/{log.15Feb16.voronoi.g++.4 ← log.15May15.voronoi.g++.4}
V		examples/voronoi/{log.15May15.voronoi.g++.1 → log.15Feb16.voronoi.g++.1}
V		examples/voronoi/{log.15May15.voronoi.g++.4 → log.15Feb16.voronoi.g++.4}
M		lib/README
M		lib/python/Makefile.lammps.python2.7
M		lib/vtk/Makefile.lammps
P		src/ASPHERE/compute_temp_asphere.h Copied to src/BODY/compute_temp_body.h
M		src/ASPHERE/pair_line_lj.h
M		src/BODY/body_nparticle.h
A		src/BODY/compute_temp_body.cpp
P		src/BODY/compute_temp_body.h Copied from src/ASPHERE/compute_temp_asphere.h
A		src/BODY/fix_nh_body.cpp
P		src/BODY/fix_nh_body.h Copied from src/KOKKOS/fix_npt_kokkos.h
A		src/BODY/fix_nph_body.cpp
P		src/BODY/fix_nph_body.h Copied from src/KOKKOS/fix_npt_kokkos.h
A		src/BODY/fix_npt_body.cpp
P		src/BODY/fix_npt_body.h Copied from src/KOKKOS/fix_npt_kokkos.h
A		src/BODY/fix_nvt_body.cpp
P		src/BODY/fix_nvt_body.h Copied from src/KOKKOS/fix_npt_kokkos.h
M		src/COMPRESS/dump_atom_gz.h
M		src/COMPRESS/dump_cfg_gz.h
M		src/COMPRESS/dump_custom_gz.h
M		src/COMPRESS/dump_xyz_gz.h
M		src/CORESHELL/compute_temp_cs.h
M		src/GPU/pair_eam_alloy_gpu.h
M		src/GPU/pair_eam_fs_gpu.h
M		src/GPU/pair_lj_cubic_gpu.h
M		src/GPU/pair_tersoff_gpu.h
M		src/GPU/pair_zbl_gpu.h
M		src/GRANULAR/pair_gran_hooke_history.cpp
M		src/GRANULAR/pair_gran_hooke_history.h
M		src/KOKKOS/atom_kokkos.h
M		src/KOKKOS/atom_vec_full_kokkos.cpp
M		src/KOKKOS/compute_temp_kokkos.h
M		src/KOKKOS/dihedral_opls_kokkos.h
M		src/KOKKOS/domain_kokkos.h
P		src/KOKKOS/fix_deform_kokkos.h Copied from src/KOKKOS/fix_npt_kokkos.h
M		src/KOKKOS/fix_nh_kokkos.h
M		src/KOKKOS/fix_nph_kokkos.h
P		src/KOKKOS/fix_npt_kokkos.h Copied to multiple locations: src/BODY/fix_nh_body.h src/BODY/fix_nph_body.h src/BODY/fix_npt_body.h src/BODY/fix_nvt_body.h src/KOKKOS/fix_deform_kokkos.h
P		src/KOKKOS/fix_nvt_kokkos.h Copied to src/USER-INTEL/fix_nvt_intel.h
M		src/KOKKOS/kokkos.h
M		src/KOKKOS/pair_buck_coul_cut_kokkos.h
M		src/KOKKOS/pair_buck_coul_long_kokkos.h
M		src/KOKKOS/pair_buck_kokkos.h
M		src/KOKKOS/pair_coul_debye_kokkos.h
M		src/KOKKOS/pair_coul_long_kokkos.h
M		src/KOKKOS/pair_eam_alloy_kokkos.h
M		src/KOKKOS/pair_eam_fs_kokkos.h
M		src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.h
M		src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.h
M		src/KOKKOS/pair_lj_charmm_coul_long_kokkos.h
M		src/KOKKOS/pair_lj_class2_coul_cut_kokkos.h
M		src/KOKKOS/pair_lj_class2_coul_long_kokkos.h
M		src/KOKKOS/pair_lj_class2_kokkos.h
M		src/KOKKOS/pair_lj_cut_coul_cut_kokkos.h
M		src/KOKKOS/pair_lj_cut_coul_debye_kokkos.h
M		src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.h
M		src/KOKKOS/pair_lj_cut_coul_long_kokkos.h
M		src/KOKKOS/pair_lj_cut_kokkos.h
M		src/KOKKOS/pair_lj_expand_kokkos.h
M		src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.h
M		src/KOKKOS/pair_lj_gromacs_kokkos.h
M		src/KOKKOS/pair_lj_sdk_kokkos.h
M		src/KOKKOS/pair_sw_kokkos.h
M		src/KOKKOS/pair_tersoff_kokkos.h
M		src/KOKKOS/pair_tersoff_mod_kokkos.h
M		src/KOKKOS/pair_tersoff_zbl_kokkos.h
P		src/MAKE/OPTIONS/Makefile.intel_cpu Copied to src/MAKE/OPTIONS/Makefile.knl
P		src/MAKE/OPTIONS/Makefile.knl Copied from src/MAKE/OPTIONS/Makefile.intel_cpu
M		src/MANYBODY/pair_bop.h
M		src/MANYBODY/pair_polymorphic.cpp
M		src/MANYBODY/pair_polymorphic.h
M		src/MC/fix_atom_swap.h
M		src/MC/fix_gcmc.h
M		src/MISC/fix_deposit.h
M		src/Makefile
M		src/RIGID/fix_rigid_small.h
P		src/USER-INTEL/angle_charmm_intel.cpp Copied to src/USER-INTEL/angle_harmonic_intel.cpp
P		src/USER-INTEL/angle_harmonic_intel.cpp Copied from src/USER-INTEL/angle_charmm_intel.cpp
A		src/USER-INTEL/angle_harmonic_intel.h
A		src/USER-INTEL/dihedral_harmonic_intel.cpp
A		src/USER-INTEL/dihedral_harmonic_intel.h
A		src/USER-INTEL/dihedral_opls_intel.cpp
A		src/USER-INTEL/dihedral_opls_intel.h
A		src/USER-INTEL/fix_nvt_intel.cpp
P		src/USER-INTEL/fix_nvt_intel.h Copied from src/KOKKOS/fix_nvt_kokkos.h
A		src/USER-INTEL/fix_nvt_sllod_intel.cpp
A		src/USER-INTEL/fix_nvt_sllod_intel.h
P		src/USER-INTEL/improper_cvff_intel.cpp Copied from src/USER-INTEL/improper_harmonic_intel.cpp
A		src/USER-INTEL/improper_cvff_intel.h
P		src/USER-INTEL/improper_harmonic_intel.cpp Copied to src/USER-INTEL/improper_cvff_intel.cpp
M		src/USER-INTEL/neigh_half_bin_intel.cpp
M		src/USER-INTEL/pair_buck_coul_long_intel.cpp
M		src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
M		src/USER-INTEL/pair_lj_cut_coul_long_intel.cpp
M		src/USER-VTK/dump_custom_vtk.h
M		src/XTC/dump_xtc.h
M		src/atom.h
M		src/atom_vec_body.h
M		src/comm.cpp
M		src/comm.h
M		src/compute_chunk_atom.h
M		src/compute_hexorder_atom.h
M		src/compute_msd_chunk.h
M		src/compute_orientorder_atom.h
M		src/compute_temp.h
M		src/compute_temp_chunk.h
M		src/compute_temp_com.h
M		src/compute_temp_deform.h
M		src/compute_temp_partial.h
M		src/compute_temp_profile.h
M		src/compute_temp_ramp.h
M		src/compute_temp_region.h
M		src/compute_temp_sphere.h
M		src/delete_atoms.h
M		src/displace_atoms.h
M		src/dump.h
M		src/dump_dcd.h
M		src/dump_image.h
M		src/fix_ave_chunk.h
M		src/fix_ave_correlate.h
M		src/fix_ave_histo.h
P		src/fix_ave_histo_weight.h Copied from src/fix_nve_sphere.h
M		src/fix_ave_time.h
M		src/fix_move.h
M		src/fix_nh.h
M		src/fix_nve_limit.h
P		src/fix_nve_sphere.h Copied to src/fix_ave_histo_weight.h
M		src/fix_property_atom.h
M		src/fix_store.cpp
M		src/fix_store.h
M		src/fix_wall_region.h
M		src/group.h
M		src/info.cpp
M		src/info.h
M		src/input.cpp
M		src/input.h
M		src/kspace.h
M		src/library.cpp
M		src/molecule.cpp
M		src/molecule.h
M		src/pair.cpp
M		src/pair.h
M		src/pair_hybrid.cpp
M		src/pair_hybrid.h
M		src/read_data.h
M		src/read_restart.h
M		src/region.h
M		src/set.h
M		src/timer.h
M		src/update.h
M		src/variable.h
M		src/version.h

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

Description

Details

Event Timeline

Merged Changes

Changes (694)Show All Changes

Very Large Commit

rLAMMPS1d9d6f924170

bench/log.15Feb16.chain.fixed.icc.1

bench/log.15Feb16.chain.fixed.icc.4

bench/log.15Feb16.chain.scaled.icc.4

bench/log.15Feb16.chute.fixed.icc.1

bench/log.15Feb16.chute.fixed.icc.4

bench/log.15Feb16.chute.scaled.icc.4

bench/log.15Feb16.eam.fixed.icc.1

bench/log.15Feb16.eam.fixed.icc.4

bench/log.15Feb16.eam.scaled.icc.4

bench/log.15Feb16.lj.fixed.icc.1

bench/log.15Feb16.lj.fixed.icc.4

bench/log.15Feb16.lj.scaled.icc.4

bench/log.15Feb16.rhodo.fixed.icc.1

bench/log.15Feb16.rhodo.fixed.icc.4

bench/log.15Feb16.rhodo.scaled.icc.4

bench/log.15May15.chain.fixed.icc.1

bench/log.15May15.chain.fixed.icc.4

bench/log.15May15.chain.scaled.icc.4

bench/log.15May15.chute.fixed.icc.1

bench/log.15May15.chute.fixed.icc.4

bench/log.15May15.chute.scaled.icc.4

bench/log.15May15.eam.fixed.icc.1

bench/log.15May15.eam.fixed.icc.4

bench/log.15May15.eam.scaled.icc.4

bench/log.15May15.lj.fixed.icc.1

bench/log.15May15.lj.fixed.icc.4

bench/log.15May15.lj.scaled.icc.4

bench/log.15May15.rhodo.fixed.icc.1

bench/log.15May15.rhodo.fixed.icc.4

bench/log.15May15.rhodo.scaled.icc.4

doc/Eqs/cna_cutoff1.tex

doc/Eqs/cna_cutoff2.tex

doc/Eqs/eff_ECP1.tex

doc/Eqs/eff_ECP2.tex

doc/Eqs/fix_wall_lj1043.tex

doc/Eqs/heat_flux_k.tex

doc/Eqs/improper_dist-1.jpg

doc/Eqs/improper_dist-1.tex

doc/Eqs/pair_comb1.tex

doc/Eqs/pair_comb2.tex

doc/Eqs/pair_mdf-1.jpg

doc/Eqs/pair_mdf-1.tex

doc/Eqs/pair_mdf-2.jpg

doc/Eqs/pair_mdf-2.tex

doc/Eqs/pair_mdf-3.jpg

doc/Eqs/pair_mdf-3.tex

doc/Eqs/pair_mdf-4.jpg

doc/Eqs/pair_mdf-4.tex

doc/Eqs/pair_mdf-5.jpg

doc/Eqs/pair_mdf-5.tex

doc/Eqs/pair_mdf-6.jpg

doc/Eqs/pair_mdf-6.tex

doc/Manual.html

doc/Manual.pdf

doc/Manual.txt

doc/Section_commands.html

doc/Section_commands.txt

doc/Section_errors.html

doc/Section_errors.txt

doc/Section_python.html

doc/Section_python.txt

doc/_sources/Manual.txt

doc/_sources/Section_commands.txt

doc/_sources/Section_errors.txt

doc/_sources/Section_python.txt

doc/_sources/angle_harmonic.txt

doc/_sources/compute.txt

doc/_sources/dihedral_harmonic.txt

doc/_sources/dihedral_opls.txt

doc/_sources/dump.txt

doc/_sources/dump_custom_vtk.txt

doc/_sources/fix.txt

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

Changes (694)
Show All Changes