Merge branch 'master' into fixes-for-stable
1d8f0c762d2c
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 28 2017, 20:37.

Description

Merge branch 'master' into fixes-for-stable

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 28 2017, 20:37

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1d8f0c762d2c: Merge branch 'master' into fixes-for-stable (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 28 2017, 20:37

Commit	Author	Details	Committed
61f3ff1d2be2	Steve Plimpton	Merge branch 'master' of github.com:lammps/lammps	Mar 28 2017
111d350a223f	Steve Plimpton	fix gcmc units change for chemical potential	Mar 28 2017
1dfd61f532a6	sjplimp/GitHub	Merge pull request #432 from Pakketeretet2/user_manifold_fix	Mar 28 2017
3feffbe1de32	Stefan Paquay	Removed diagnostics.	Mar 27 2017
04fd038d350b	Stefan Paquay	Fixed a bug with equal-style variables as manifold params.	Mar 27 2017

				Path
	A			doc/src/Eqs/fix_gcmc1.jpg
	A			doc/src/Eqs/fix_gcmc1.tex
	A			doc/src/Eqs/fix_gcmc2.jpg
	A			doc/src/Eqs/fix_gcmc2.tex
	A			doc/src/Eqs/fix_gcmc3.jpg
	A			doc/src/Eqs/fix_gcmc3.tex
	M			doc/src/dihedral_charmm.txt
	M			doc/src/fix_gcmc.txt
	M			doc/src/pair_charmm.txt
	M			examples/gcmc/in.gcmc.lj
	M			examples/gcmc/log.24Mar17.gcmc.lj.g++.1
	M			examples/gcmc/log.24Mar17.gcmc.lj.g++.4
	M			src/MC/fix_gcmc.cpp
	M			src/USER-MANIFOLD/fix_manifoldforce.cpp
	M			src/USER-MANIFOLD/fix_nve_manifold_rattle.cpp
	M			src/USER-MANIFOLD/manifold.h
	M			src/update.cpp