Commit Graph

231 Commits

Author SHA1 Message Date
ef856fdbdf Merge ssh://lens.ccs.ornl.gov/~/git/lammps 2011-10-26 19:47:51 -04:00
0bee1c14e0 Merge branch 'master' of http://git.icms.temple.edu/lammps-ro
Conflicts:
	doc/pair_coul.txt
	lib/gpu/Nvidia.makefile
	lib/gpu/README
	src/GPU/fix_gpu.cpp
	src/GPU/pair_cg_cmm_coul_long_gpu.cpp
	src/GPU/pair_cg_cmm_coul_msm_gpu.cpp
	src/GPU/pair_cg_cmm_gpu.cpp
	src/GPU/pair_coul_long_gpu.cpp
	src/GPU/pair_coul_long_gpu.h
	src/GPU/pair_gayberne_gpu.cpp
	src/GPU/pair_lj96_cut_gpu.cpp
	src/GPU/pair_lj_charmm_coul_long_gpu.cpp
	src/GPU/pair_lj_class2_coul_long_gpu.cpp
	src/GPU/pair_lj_class2_gpu.cpp
	src/GPU/pair_lj_cut_coul_cut_gpu.cpp
	src/GPU/pair_lj_cut_coul_long_gpu.cpp
	src/GPU/pair_lj_cut_gpu.cpp
	src/GPU/pair_lj_cut_tgpu.cpp
	src/GPU/pair_lj_expand_gpu.cpp
	src/GPU/pair_morse_gpu.cpp
	src/GPU/pair_resquared_gpu.cpp
2011-10-26 19:45:38 -04:00
524bc21243 Moving where opencl parameters are output. 2011-10-26 17:49:31 -04:00
db8cc02e18 Adding a capability for neighbor builds to openCL builds. 2011-10-26 17:42:21 -04:00
41e7406f3e Switching sqrt to rsqrt where possible. Adding a FERMI_OCL define for
opencl parameters and OpenCL Vendor output.
2011-10-26 16:54:41 -04:00
55f5a14b25 Modified code to use preprocessor definitions for transcendentals. 2011-10-26 15:15:49 -04:00
e6db03c6ff Bug fixes for new neighbor storage. 2011-10-24 17:52:35 -04:00
27cacf40ea Adding missing file required for new neighbor storage. 2011-10-24 12:43:00 -04:00
166cf1e2c2 Updating mac makefile to use 64 bit. 2011-10-24 12:40:10 -04:00
818d85b1f2 Updating Makefile.mac to use 64 bit compilation. 2011-10-23 18:18:15 -04:00
cab77720de Replacing mul24 with fast_mul in device code. 2011-10-23 18:04:42 -04:00
b0ee11cadd Updating neighbor list storage to be coalesced for multiple threads per atom. 2011-10-23 17:52:02 -04:00
d3742d1ec4 Updating makefile for new GPU. 2011-10-11 17:57:08 -04:00
4591d9958d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7048 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-10-07 23:52:06 +00:00
79e1087146 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7021 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-09-30 16:58:31 +00:00
73b8888b98 Updating code so that only free memory output is on 1st GPU. 2011-09-16 14:00:39 -04:00
2a91f37ba8 Changed order of CPU cell bin in neighbor calculation to allow overlap
with atom data transfer. Adding timing output.
2011-09-13 17:51:30 -04:00
cde64685eb Implemented hybrid neighbor list builds. 2011-09-13 14:54:53 -04:00
bea92ccf69 Adding storage for hybrid neighbor list build data. 2011-09-12 16:37:56 -04:00
d4b1037036 Changed files to accept a new GPU mode for hybrid neighboring. 2011-09-12 16:09:03 -04:00
f20b7ed31f Fixed some comments to reflect new neighboring stuff. 2011-09-12 09:24:49 -04:00
541c47f4d4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6766 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-23 21:12:16 +00:00
7a1f6fc1ee git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6765 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-23 21:11:35 +00:00
46240b2300 Fixing some typos. 2011-08-23 10:44:16 -04:00
8b29a07c23 Merge branch 'master' of http://git.icms.temple.edu/lammps-ro
Conflicts:
	doc/Section_commands.txt
	lib/gpu/README
	src/lmptype.h
2011-08-22 18:22:32 -04:00
d22491de17 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6729 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-18 17:32:34 +00:00
84b5b0bef8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6727 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-18 17:32:05 +00:00
3c1cefdba0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6625 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-08 19:51:22 +00:00
43d9cc7811 Adding an OCL_VENDOR preprocessor definition. 2011-07-27 17:31:47 -04:00
bf6d34160e Adding preprocessor to OpenCL strings and as a dependency for both. 2011-07-27 16:58:50 -04:00
7b3188fec8 Fixing OpenCL to compile with new geryon converter. 2011-07-27 16:50:35 -04:00
8540f8500a Changed geryon file to string behaviour and updated only nvidia files. 2011-07-27 16:31:01 -04:00
cd953bfc5d Changing __inline to ucl_inline. 2011-07-27 14:29:12 -04:00
f7abd1cb5e Renaming nv_kernel_def. 2011-07-27 14:23:31 -04:00
13a3d4cb6d Consolidating all of the preprocessor stuff. 2011-07-27 14:00:48 -04:00
6ffdce24e9 Bug fixes for e_coul when cutoff is smaller than vdw. 2011-07-26 17:54:34 -04:00
c0872e0d7c Adding coul/long. 2011-07-26 16:45:43 -04:00
121346946c Finished renaming, adding namespace. 2011-07-26 14:20:18 -04:00
0ac36b2409 Update pppm to work with opencl. 2011-07-11 19:36:55 -04:00
3ff236d7b5 Renaming charmm external functions. 2011-07-11 19:02:50 -04:00
3a4c2dcc36 Fixing memory grow bug for PPPM. 2011-07-05 13:35:18 -04:00
405de06265 Merge branch 'master' of ssh://yona.ccs.ornl.gov/~/git/lammps 2011-06-24 12:32:58 -04:00
c71a4826ef Merge branch 'master' of http://git.icms.temple.edu/lammps-ro
Conflicts:
2011-06-24 12:30:07 -04:00
2eddcf044a Renaming... 2011-06-17 15:40:51 -04:00
945343265e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6407 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-14 13:34:06 +00:00
9418bacff7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6406 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-14 13:33:48 +00:00
479275be1d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6405 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-14 13:32:50 +00:00
e7ce7a5a93 Getting rid of _ext from kernel names. 2011-06-13 17:09:23 -04:00
47177cc75f More renaming. 2011-06-13 16:56:32 -04:00
9ee36a3c22 More renaming... 2011-06-10 17:31:48 -04:00