Merge branch 'lammps-lal' into lammps-icms-lal
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jan 24 2012, 01:37 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSa7e57915f70c: Added a header needed to compile with Cray cce.
rLAMMPS3bd93ccd243e: added benchmarks for adp and airebo - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
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 | |||
acca720c4288 | W. Michael Brown | Merge branch 'master' of https://bitbucket.org/wb8/lal | Jan 23 2012 | |||
038497434662 | Nguyen | Made separate kernels for different table styles, removed inline functions | Jan 23 2012 | |||
be352c7ff761 | W. Michael Brown | Merge ssh://lens.ccs.ornl.gov/~/git/lammps | Jan 22 2012 | |||
6946fb516f1b | Mike Brown | Merge branch 'master' of http://git.icms.temple.edu/lammps-ro | Jan 22 2012 | |||
10ce8fa895e8 | W. Michael Brown | Merge ssh://lens.ccs.ornl.gov/~/git/lammps | Jan 22 2012 | |||
bc313165510e | Trung Nguyen | Updated doc .txt files for buck/gpu, buck/coul/cut/gpu and buck/coul/long/gpu… | Jan 21 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 | |||
f2fc03bf8e2d | W. Michael Brown | Making regression test logs consistent with new tests. | Jan 19 2012 | |||
922a9d172d1e | W. Michael Brown | Renaming eam/alloy/gpu tests. | Jan 18 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 | |||
9fc0083f6a91 | Nguyen | Updated the potential table with two entries | Jan 18 2012 | |||
7f703cb29a5f | Nguyen | Rearranged pair table/gpu kernels, bugs in bitmap style | Jan 18 2012 | |||
67362186addf | Nguyen | Added tests for two-type eam | Jan 18 2012 | |||
9536e6921158 | W. Michael Brown | Cleaning up new regression tests. Fresh run of all tests for CPU/GPU. Table… | Jan 18 2012 | |||
ef3365d3ff86 | W. Michael Brown | Renaming some regression tests. Removing eam energy conservation test. Adding… | Jan 17 2012 | |||
981383436da8 | W. Michael Brown | Fixing bug in neighbor build to prevent copy of host neighbor list when the… | Jan 17 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 | |||
fa369317d147 | W. Michael Brown | Setting the fft times to 0 for the real-space partition when verlet/split is… | Dec 22 2011 | |||
daa6b1a6a773 | Mike Brown | Merge branch 'master' of http://git.icms.temple.edu/lammps-ro | Dec 22 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 | |||
e369a44400c5 | W. Michael Brown | Merge branch 'master' of ssh://yona.ccs.ornl.gov/~/git/lammps | Dec 16 2011 | |||
e333a11b5945 | Mike Brown | Merge branch 'master' of http://git.icms.temple.edu/lammps-ro | 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 | |||
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 |