Merge pull request #238 from giacomofiorin/colvars-2016-10-24
ad5f7c458196
Actions

Authored by sjplimp <sjplimp@sandia.gov> on Oct 25 2016, 18:32.

Description

Merge pull request #238 from giacomofiorin/colvars-2016-10-24

Colvars fixes and small changes

Committed

GitHub <noreply@github.com>

Oct 25 2016, 18:32

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
f8367e3d0fee	Axel Kohlmeyer	update documentation pdf for updated colvars lib	Oct 24 2016
ba6d1528bb17	Axel Kohlmeyer	Merge branch 'colvars-2016-10-24' of https://github.com/giacomofiorin/lammps…	Oct 24 2016
182141b85005	Giacomo Fiorin	Make SMP parallelism for Colvars optional	Oct 24 2016
e02505c8cc33	Giacomo Fiorin	Add ensemble-biased metadynamics (Fabrizio Marinelli, NIH)	Oct 24 2016
be2d155cef25	Giacomo Fiorin	Minor changes and fixes not relevant to LAMMPS	Oct 24 2016
c2430939809e	Giacomo Fiorin	Fix wall forces and subtractAppliedForce for extended-Lagrangian ABF	Oct 24 2016
ad57a17f48c8	Giacomo Fiorin	Add C-linkage wrapper for colvarscript (useful with ctypes)	Oct 24 2016

				Path
	M			doc/src/PDF/colvars-refman-lammps.pdf
	M			lib/colvars/colvar.cpp
	M			lib/colvars/colvaratoms.cpp
	M			lib/colvars/colvaratoms.h
	M			lib/colvars/colvarbias_abf.cpp
	M			lib/colvars/colvarbias_abf.h
	M			lib/colvars/colvarbias_meta.cpp
	M			lib/colvars/colvarbias_meta.h
	M			lib/colvars/colvarcomp.cpp
	M			lib/colvars/colvardeps.cpp
	M			lib/colvars/colvarmodule.cpp
	M			lib/colvars/colvarmodule.h
	M			lib/colvars/colvarparse.cpp
	M			lib/colvars/colvarproxy.h
	M			lib/colvars/colvarscript.cpp
	M			src/USER-COLVARS/colvarproxy_lammps.cpp