Merge branch 'master' into new-neighbor
114926a4886b
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 2 2016, 06:26.

Description

Merge branch 'master' into new-neighbor

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 2 2016, 06:26

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS114926a4886b: Merge branch 'master' into new-neighbor (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 2 2016, 06:26

Commit	Author	Details	Committed
e2c7acabac53	sjplimp/GitHub	Merge pull request #187 from akohlmey/colvars-update-2016-09-30	Sep 30 2016
91edee25302a	sjplimp/GitHub	Merge pull request #186 from akohlmey/small-bugfixes	Sep 30 2016
b9d0f96a1923	Steve Plimpton	change purge target in Makefile, also fixed one issue with Make.py	Sep 30 2016
5bb85b482d71	Axel Kohlmeyer	remove unused variable	Sep 30 2016
d4b074d85b68	Axel Kohlmeyer	enable dynamic groups for fix dt/reset	Sep 30 2016
6d200061ca64	Axel Kohlmeyer	update colvars library to version 2016-09-30	Sep 30 2016
cb7bd2799e7e	Axel Kohlmeyer	flag header as C++ to emacs	Sep 30 2016
4337f2c240d7	Axel Kohlmeyer	include charmm22 and charmm36 cmap files and include date added signature	Sep 30 2016
0eeb24073051	Axel Kohlmeyer	whitespace cleanup, fix bug in looking for empty strings, improve read…	Sep 30 2016
c88acc961340	Axel Kohlmeyer	make reader for target geometry file more resilient	Sep 30 2016

				Path
	M			doc/src/PDF/colvars-refman-lammps.pdf
	M			doc/src/fix_colvars.txt
	P			examples/cmap/charmm22.cmap Copied to potentials/charmm22.cmap
	M			examples/tad/README
	M			lib/colvars/colvar.cpp
	M			lib/colvars/colvar.h
	M			lib/colvars/colvarbias_histogram.cpp
	M			lib/colvars/colvarbias_meta.cpp
	M			lib/colvars/colvarbias_restraint.cpp
	M			lib/colvars/colvarbias_restraint.h
	M			lib/colvars/colvarcomp.cpp
	M			lib/colvars/colvarcomp.h
	M			lib/colvars/colvarcomp_angles.cpp
	M			lib/colvars/colvarcomp_coordnums.cpp
	M			lib/colvars/colvarcomp_distances.cpp
	M			lib/colvars/colvardeps.cpp
	M			lib/colvars/colvardeps.h
	M			lib/colvars/colvargrid.h
	M			lib/colvars/colvarmodule.cpp
	M			lib/colvars/colvarmodule.h
	M			lib/colvars/colvarscript.cpp
	M			lib/colvars/colvartypes.h
	P			potentials/charmm22.cmap Copied from examples/cmap/charmm22.cmap
	A			potentials/charmm36.cmap
	A			src/KOKKOS/comm_tiled_kokkos.cpp
	A			src/KOKKOS/comm_tiled_kokkos.h
	M			src/KOKKOS/neighbor_kokkos.cpp
	M			src/MOLECULE/fix_cmap.cpp
	M			src/MOLECULE/fix_cmap.h
	M			src/Make.py
	M			src/Makefile
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/comm_tiled.cpp
	M			src/comm_tiled.h
	M			src/fix_dt_reset.cpp
	M			src/fix_tmd.cpp