Merge branch 'master' into updates-for-stable
8820315ff96a
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 23 2017, 22:57.

Description

Merge branch 'master' into updates-for-stable

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 23 2017, 22:57

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8820315ff96a: Merge branch 'master' into updates-for-stable (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 23 2017, 22:57

	Commit			Author	Details	Committed
	44841f689127			Steve Plimpton	fix ave/chunk fixes, 2d disc option, fix_modify dynamic/dof	Mar 23 2017

				Path
	M			doc/src/Section_howto.txt
	M			doc/src/Section_python.txt
	M			doc/src/compute_modify.txt
	M			doc/src/compute_sna_atom.txt
	M			doc/src/fix_deposit.txt
	M			doc/src/fix_gcmc.txt
	M			doc/src/fix_modify.txt
	M			doc/src/fix_pour.txt
	M			doc/src/pair_snap.txt
	M			examples/accelerate/in.lc
	M			examples/deposit/in.deposit.atom
	M			examples/deposit/in.deposit.molecule
	M			examples/deposit/in.deposit.molecule.shake
	M			examples/ellipse/in.ellipse.gayberne
	M			examples/ellipse/in.ellipse.resquared
	M			examples/granregion/in.granregion.box
	M			examples/pour/in.pour
	M			examples/pour/in.pour.2d
	M			examples/pour/in.pour.2d.molecule
	M			examples/snap/Ta06A.snapparam
	M			examples/snap/W_2940_2017_2.snapparam
	M			src/MC/fix_gcmc.cpp
	M			src/MC/fix_gcmc.h
	M			src/MISC/fix_deposit.cpp
	M			src/RIGID/fix_rigid_nh_small.cpp
	M			src/RIGID/fix_rigid_nh_small.h
	M			src/SNAP/compute_sna_atom.cpp
	M			src/SNAP/compute_snad_atom.cpp
	M			src/SNAP/compute_snav_atom.cpp
	M			src/SNAP/pair_snap.cpp
	M			src/SNAP/pair_snap.h
	M			src/SNAP/sna.cpp
	M			src/SNAP/sna.h
	M			src/balance.cpp
	M			src/comm.cpp
	M			src/compute.cpp
	M			src/fix.cpp
	M			src/fix.h
	M			src/fix_momentum.h
	M			src/fix_nh.cpp
	M			src/library.cpp
	M			src/special.cpp