Merge branch 'small-bugfixes' of github.com:akohlmey/lammps into small-bugfixes
51e4a568c9b1
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 13 2016, 20:32.

Description

Merge branch 'small-bugfixes' of github.com:akohlmey/lammps into small-bugfixes

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 13 2016, 20:32

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
14bed44743d6	Axel Kohlmeyer	ignore Makefile.lammps in lib tree	Sep 13 2016
18cacb8e1dab	Axel Kohlmeyer	ignore *.mod generated by fortran compilers	Sep 13 2016
e53862ca4a23	Axel Kohlmeyer	update html file updated boundary.txt file	Sep 11 2016
a64eb330e3a2	Axel Kohlmeyer	document how using shrink-wrap boundaries can cause lost atoms in parallel	Sep 11 2016
d70e051ecd7f	Axel Kohlmeyer	update docs for lj/sf/dipole/sf	Sep 9 2016
37833b537b9b	Axel Kohlmeyer	restore c++ marker in header comment	Sep 9 2016
5fcbfa824820	Axel Kohlmeyer	simplify phonon code some more	Sep 9 2016
c437195928a0	Axel Kohlmeyer	simplify code	Sep 9 2016
8b1ef1c686cb	Axel Kohlmeyer	import updated pair lj/sf/dipole/sf files from sam genheden	Sep 9 2016
c3e8cb2f30c5	Axel Kohlmeyer	fix typo in comments	Sep 9 2016
365707704cf8	Axel Kohlmeyer	update error message to be consistent with other styles	Sep 9 2016
16323ba391ea	Axel Kohlmeyer	require an atom map for compute voronoi/atom occupation	Sep 9 2016

				Path
	M			doc/html/boundary.html
	M			doc/html/compute_rdf.html
	M			doc/html/fix_adapt.html
	M			doc/html/pair_dipole.html
	M			doc/src/boundary.txt
	M			doc/src/fix_adapt.txt
	M			doc/src/pair_dipole.txt
	A			examples/COUPLE/fortran2/.gitignore
	A			lib/.gitignore
	A			lib/meam/.gitignore
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid_small.cpp
	M			src/USER-COLVARS/fix_colvars.cpp
	M			src/USER-COLVARS/fix_colvars.h
	M			src/USER-MISC/pair_lj_sf_dipole_sf.cpp
	M			src/USER-MISC/pair_lj_sf_dipole_sf.h
	M			src/USER-PHONON/fix_phonon.cpp
	M			src/VORONOI/compute_voronoi_atom.cpp