Merge branch 'lammps-icms' into lammps-colvars
5bf5142f296a
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 5 2012, 13:42.

Description

Merge branch 'lammps-icms' into lammps-colvars

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 5 2012, 13:42

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS5bf5142f296a: Merge branch 'lammps-icms' into lammps-colvars (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 5 2012, 13:42

Commit	Author	Details	Committed
880e389dfb6d	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Nov 5 2012
05a02426a98e	pscrozi	Updated GPU package to correspond with coulomb table changes.	Oct 31 2012
4039a398c8df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9034 f3b2605a-c512-4ea7…	Oct 29 2012
3aeed8f0db69	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9033 f3b2605a-c512-4ea7…	Oct 29 2012
2580f8b5fcde	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9032 f3b2605a-c512-4ea7…	Oct 29 2012

				Path
	M			doc/Eqs/pair_meam_sw_spline.jpg
	A			doc/Eqs/pair_meam_sw_spline.tex
	M			src/GPU/pair_coul_long_gpu.cpp
	M			src/GPU/pair_lj_charmm_coul_long_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_long_gpu.cpp
	M			src/USER-MISC/pair_meam_spline.cpp
	M			src/USER-MISC/pair_meam_spline.h
	M			src/USER-MISC/pair_meam_sw_spline.cpp
	M			src/USER-MISC/pair_meam_sw_spline.h