Commit Graph

7 Commits

Author SHA1 Message Date
c8f9dde962 Merge branch 'master' of http://git.icms.temple.edu/lammps-ro
Conflicts:
	doc/Section_commands.txt
	doc/pair_coul.txt
	lib/gpu/Makefile.firefly
	lib/gpu/Makefile.firefly_opencl
	lib/gpu/Nvidia.makefile
	lib/gpu/Opencl.makefile
	lib/gpu/lal_atom.cpp
	lib/gpu/lal_atom.h
	lib/gpu/lal_cg_cmm.cpp
	lib/gpu/lal_cg_cmm.cu
	lib/gpu/lal_cg_cmm.h
	lib/gpu/lal_cg_cmm_ext.cpp
	lib/gpu/lal_cg_cmm_long.cpp
	lib/gpu/lal_cg_cmm_long.cu
	lib/gpu/lal_cg_cmm_long.h
	lib/gpu/lal_cg_cmm_long_ext.cpp
	lib/gpu/lal_cg_cmm_msm.cpp
	lib/gpu/lal_cg_cmm_msm.cu
	lib/gpu/lal_cg_cmm_msm.h
	lib/gpu/lal_cg_cmm_msm_ext.cpp
	lib/gpu/lal_device.cpp
	lib/gpu/lal_neighbor_gpu.cu
	lib/gpu/lal_precision.h
	lib/gpu/lal_preprocessor.h
	lib/gpu/replace_code.sh
	src/GPU/pair_cg_cmm_coul_msm_gpu.cpp
	src/GPU/pair_lj_cut_coul_long_gpu.cpp
	src/GPU/pair_lj_cut_tgpu.cpp
	src/GPU/pair_lj_sdk_coul_long_gpu.cpp
	src/GPU/pair_lj_sdk_gpu.cpp
	src/USER-OMP/pair_lj_sdk_coul_long_omp.h
	src/USER-OMP/pair_rebo_omp.cpp
	src/USER-OMP/pair_rebo_omp.h
	src/USER-OMP/pair_tri_lj_omp.h
	src/USER-OMP/pppm_proxy.h
	src/USER-OMP/pppm_tip4p_proxy.h
	src/comm.cpp
	src/comm.h
	src/neighbor.h
2011-12-14 13:17:21 -05:00
d1f2eaeb4d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7284 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-02 16:12:34 +00:00
7837edd51f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7281 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-02 16:02:36 +00:00
778916f630 Making CUDPP optional for nvidia builds. 2011-11-24 13:26:17 -05:00
51c0f18c1d Adding error checking for compute exclusive mode. 2011-10-30 17:15:50 -04:00
fcf2d32f8b Adding answer clear to pppm clear function to prevent seg fault. Adding timing info for copy on hybrid neighbor lists. Removing duplicate output from base_ellipsoid. 2011-10-27 20:58:57 -04:00
ad68b61b46 Renaming files to have lal prefix. 2011-10-26 21:34:02 -04:00