Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
cdbf26c64b44
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 14 2014, 13:06.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt
lib/gpu/lal_sw.cu

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 14 2014, 13:06

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
35814a93ebb1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11239 f3b2605a-c512-4ea7…	Jan 13 2014
cf13b6fe20b7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11238 f3b2605a-c512-4ea7…	Jan 13 2014
59a0c577db1d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11236 f3b2605a-c512-4ea7…	Jan 13 2014
a5a0f79217e5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11235 f3b2605a-c512-4ea7…	Jan 13 2014
fd43c548c8ab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11234 f3b2605a-c512-4ea7…	Jan 13 2014
94a4b3f20a8a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11233 f3b2605a-c512-4ea7…	Jan 13 2014
29af85e638c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11232 f3b2605a-c512-4ea7…	Jan 13 2014
496746e338e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11231 f3b2605a-c512-4ea7…	Jan 13 2014
bbffbe06a229	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11230 f3b2605a-c512-4ea7…	Jan 13 2014
427e90c15149	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11229 f3b2605a-c512-4ea7…	Jan 13 2014

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/pair_gromacs.html
	M			doc/pair_gromacs.txt
	M			doc/pair_sw.html
	M			doc/pair_sw.txt
	M			lib/gpu/Nvidia.makefile
	M			lib/gpu/Opencl.makefile
	M			lib/gpu/lal_buck_coul_long.cpp
	M			lib/gpu/lal_coul_dsf.cpp
	M			lib/gpu/lal_coul_dsf.h
	P			lib/gpu/lal_lj_gromacs.cpp Copied from lib/gpu/lal_lj96.cpp
	P			lib/gpu/lal_lj_gromacs.cu Copied from lib/gpu/lal_gauss.cu
	P			lib/gpu/lal_lj_gromacs.h Copied from lib/gpu/lal_lj_coul_msm.h
	A			lib/gpu/lal_lj_gromacs_ext.cpp
	M			lib/gpu/lal_sw.cpp
	M			lib/gpu/lal_sw.cu
	M			lib/gpu/lal_sw.h
	M			lib/gpu/lal_sw_ext.cpp
	M			src/GPU/Install.sh
	P			src/GPU/pair_lj_gromacs_gpu.cpp Copied from src/GPU/pair_soft_gpu.cpp
	P			src/GPU/pair_lj_gromacs_gpu.h Copied from src/GPU/pair_born_coul_long_gpu.h
	M			src/GPU/pair_sw_gpu.cpp
	M			src/domain.cpp
	M			src/version.h