History Graph
History Graph
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
48fbb5605f1b | Axel Kohlmeyer | fix another merge bug | Jan 16 2013 | |||
100cafe5fffc | Axel Kohlmeyer | correct error from broken merge | Jan 16 2013 | |||
427161ef56aa | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Jan 9 2013 | |||
c8624bc7ebb8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9175 f3b2605a-c512-4ea7… | Jan 2 2013 | |||
9a0e9670fb05 | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Oct 12 2012 | |||
209999068ced | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8810 f3b2605a-c512-4ea7… | Sep 21 2012 | |||
c6552844abcf | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Aug 25 2012 | |||
0d36adc00bf0 | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Aug 23 2012 | |||
c81a8f1bc932 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8699 f3b2605a-c512-4ea7… | Aug 23 2012 | |||
647ea4c29f79 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8694 f3b2605a-c512-4ea7… | Aug 21 2012 | |||
31551d81fdf9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8693 f3b2605a-c512-4ea7… | Aug 21 2012 | |||
ca9da5d35ee1 | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Apr 20 2012 | |||
0a85b18a46e8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8027 f3b2605a-c512-4ea7… | Apr 19 2012 | |||
816e87c46f16 | Axel Kohlmeyer | don't use cudpp and relocatable compilation. | Mar 30 2012 | |||
99851266a8fc | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Mar 29 2012 | |||
f3905bf229dd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7989 f3b2605a-c512-4ea7… | Mar 29 2012 | |||
a1f79c40fe04 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7922 f3b2605a-c512-4ea7… | Mar 7 2012 | |||
10ac23c12008 | Axel Kohlmeyer | import OpenCL bugfix from mike brown. | Mar 7 2012 | |||
47e2a3a5fc45 | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Mar 3 2012 | |||
d30ba2d7eb64 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7885 f3b2605a-c512-4ea7… | Mar 2 2012 | |||
6214cf294416 | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Feb 2 2012 | |||
2c42373bc8d0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7644 f3b2605a-c512-4ea7… | Feb 1 2012 | |||
53449d437525 | Axel Kohlmeyer | adjust makefile default settings | Jan 31 2012 | |||
32dba78215df | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7618 f3b2605a-c512-4ea7… | Jan 31 2012 | |||
8149b411038d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7616 f3b2605a-c512-4ea7… | Jan 31 2012 | |||
aa13dbbe66bc | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Jan 27 2012 | |||
65ac3b2dec52 | Axel Kohlmeyer | embed path to shared gpu library | Jan 27 2012 | |||
00c4af42a482 | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Jan 26 2012 | |||
a91b67d8154c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7586 f3b2605a-c512-4ea7… | Jan 26 2012 | |||
2aaf4f6d7e96 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7581 f3b2605a-c512-4ea7… | Jan 25 2012 | |||
6b1774dc2052 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7575 f3b2605a-c512-4ea7… | Jan 25 2012 | |||
483d9fc5b570 | Axel Kohlmeyer | correct OpenCL makefile | Jan 25 2012 | |||
86b6a0044923 | Axel Kohlmeyer | Merge branch 'lammps-lal' into lammps-icms-lal | Jan 24 2012 | |||
a7e57915f70c | W. Michael Brown | Added a header needed to compile with Cray cce. | Jan 23 2012 | |||
5da8da06ab12 | W. Michael Brown | Moving the order of bool variables in lal_table to match constructor assignment. | Jan 23 2012 | |||
038497434662 | Nguyen | Made separate kernels for different table styles, removed inline functions | Jan 23 2012 | |||
10ce8fa895e8 | W. Michael Brown | Merge ssh://lens.ccs.ornl.gov/~/git/lammps | Jan 22 2012 | |||
274c3d38c4d7 | Nguyen | - Updated geryon lib for Apple OpenCL - Fixed typos in Nvidia.makefile and… | Jan 21 2012 | |||
13c2da0546df | W. Michael Brown | Fixing issue with OpenCL. Unused memory pointers that are arguments to kernels… | Jan 20 2012 | |||
4b0e911573fd | W. Michael Brown | Code formatting and added log file for table with bitmap for regression tests. | Jan 19 2012 | |||
dd62b23a1742 | Trung Nguyen | Fixed bugs with bitmap table/gpu | Jan 19 2012 | |||
5870b4fff77b | W. Michael Brown | Merge branch 'master' of https://bitbucket.org/wb8/lal | Jan 18 2012 | |||
eedce7ae8971 | W. Michael Brown | Cleaning up code formatting. | Jan 18 2012 | |||
67362186addf | Nguyen | Added tests for two-type eam | Jan 18 2012 | |||
981383436da8 | W. Michael Brown | Fixing bug in neighbor build to prevent copy of host neighbor list when the… | Jan 17 2012 | |||
909931539d6d | Axel Kohlmeyer | support compiling the GPU library as shared lib. | Jan 16 2012 | |||
52ec090bd648 | W. Michael Brown | Merge branch 'master' of ssh://yona.ccs.ornl.gov/~/git/lammps | Jan 9 2012 | |||
949937d725c6 | Mike Brown | Merge branch 'master' of http://git.icms.temple.edu/lammps-ro | Jan 9 2012 | |||
b7cece5210f8 | W. Michael Brown | Merge branch 'master' of https://bitbucket.org/wb8/lal | Jan 9 2012 | |||
4ae1ca521cd4 | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Jan 7 2012 | |||
aac0e5699f0e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7426 f3b2605a-c512-4ea7… | Jan 6 2012 | |||
a242911efdfa | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7422 f3b2605a-c512-4ea7… | Jan 6 2012 | |||
221499203559 | Axel Kohlmeyer | Merge branch 'openmp-master' into lammps-icms | Jan 1 2012 | |||
9259ae869929 | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Jan 1 2012 | |||
d0686fbd3fbc | Axel Kohlmeyer | terminate all inline function declaration with ';' | Dec 27 2011 | |||
6844100cbbb9 | W. Michael Brown | Fixing some bugs introduced in the last commit for PPPM. | Dec 21 2011 | |||
ea067ec4e65e | Trung Nguyen | Improved the 2nd kernel eam/lj just a little bit | Dec 21 2011 | |||
04034b61789e | W. Michael Brown | Updates to support pppm/gpu with verlet/split. Updates from Steve for using… | Dec 21 2011 | |||
771b45690752 | W. Michael Brown | Changes to pppm to support verlet/split. Not yet working. | Dec 21 2011 | |||
abb538b81420 | Nguyen | Added eam/lj/gpu | Dec 20 2011 | |||
75cb370d34f9 | W. Michael Brown | Moving fp array resize for EAM before the inum check to prevent segmentation… | Dec 19 2011 | |||
d8657857868e | W. Michael Brown | Moving energy pointer offset to only happen with eflag in eam. Adding some… | Dec 19 2011 | |||
7d47a0f6b93b | Nguyen | Fixed a bug with storing fp to incorrect indices | Dec 19 2011 | |||
4b180c8a31ce | W. Michael Brown | Removing comments from fast kernels. | Dec 19 2011 | |||
dbde8f425bfd | Trung Nguyen | Fixing bugs in eam/gpu, force compute still not working properly for 2 atom… | Dec 17 2011 | |||
3bcd98d4f112 | W. Michael Brown | Merge branch 'master' of ssh://firefly9.ornl.gov/~/code/lammps | Dec 16 2011 | |||
ac97aa3e9414 | W. Michael Brown | Adding a int2 type. | Dec 16 2011 | |||
b7a2dc6eba60 | W. Michael Brown | Geryon update. | Dec 16 2011 | |||
21778b853139 | W. Michael Brown | Merge branch 'master' of https://bitbucket.org/wb8/lal | Dec 14 2011 | |||
7f9dc9a8a976 | W. Michael Brown | Adding files removed from the last sync with main lammps. | Dec 14 2011 | |||
40cadfabf5ed | W. Michael Brown | Merge branch 'master' of ssh://yona.ccs.ornl.gov/~/git/lammps | Dec 14 2011 | |||
145ec27e2be5 | Mike Brown | Fixes that didn't get incorporated in last merge. | Dec 14 2011 | |||
c8f9dde96262 | Mike Brown | Merge branch 'master' of http://git.icms.temple.edu/lammps-ro | Dec 14 2011 | |||
2b97a34844b2 | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Dec 9 2011 | |||
f56f6a1a9dd4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7320 f3b2605a-c512-4ea7… | Dec 9 2011 | |||
4a2feb25b2ec | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7317 f3b2605a-c512-4ea7… | Dec 9 2011 | |||
dbbe077dc2f4 | Nguyen | clear the first-part kernels in the eam destructor | Dec 7 2011 | |||
b2bc6488fc03 | Nguyen | Fixed typos in Opencl.makefile to make opencl build works | Dec 5 2011 | |||
3aa095df1569 | W. Michael Brown | Removing the write-only qualifier from the device fp allocation. | Dec 5 2011 | |||
65af20efac0b | Trung Nguyen | Added __sync_threads() for fast eam kernels | Dec 5 2011 | |||
35501959ec5d | Trung Nguyen | Put type2frho into shared memory for fast eam energy kernel | Dec 4 2011 | |||
1d63e0058c83 | Trung Nguyen | Store splined data arrays into textures and used fetches | Dec 4 2011 | |||
4cd0370ce47b | Trung Nguyen | Updated the first eam kernel | Dec 4 2011 | |||
e841320e8d16 | Trung Nguyen | Removed unnecessary params in eam function prototypes; combined two versions of… | Dec 4 2011 | |||
3803804d3806 | W. Michael Brown | Removing the need for 2 allocations for fp on the host. | Dec 4 2011 | |||
03b5ea7c1412 | Trung Nguyen | Put type2rhor_z2r into shared memory in the fast kernel | Dec 3 2011 | |||
5af93163abe3 | Trung Nguyen | Packed arrays into numtyp4 for eam/gpu | Dec 3 2011 | |||
51e3ab376454 | Trung Nguyen | Fixed bugs in passing fp to energy kernel, switch fp to numtyp, virial… | Dec 3 2011 | |||
7595f64f0577 | Axel Kohlmeyer | cosmetic changes | Dec 3 2011 | |||
ca4f23380212 | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Dec 3 2011 | |||
17fedb750282 | Nguyen | Updated eam/gpu, virial still not working | Dec 3 2011 | |||
196e2743f7b7 | Axel Kohlmeyer | gpu library updates from sync with steve | Dec 2 2011 | |||
7c50735710a3 | W. Michael Brown | Merge branch 'master' of ssh://firefly9.ornl.gov/~/code/lammps | Dec 2 2011 | |||
eb012034b1b9 | W. Michael Brown | Making the add_transfer_time function in lal_atom accept ms instead of seconds. | Dec 2 2011 | |||
713f9eb1d542 | W. Michael Brown | Merge remote branch 'bitbucket/master' | Dec 2 2011 | |||
3414e1f41d24 | W. Michael Brown | Adding ability to add in additional data transfer, cast, and kernel times for… | Dec 2 2011 | |||
5d94d8642a5f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7292 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
9c9282d0242e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7291 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
d1f2eaeb4d4b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7284 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
2728aab0e5e1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7283 f3b2605a-c512-4ea7… | Dec 2 2011 |
c4science · Help