Homec4science

Merge branch 'lammps-lal' into lammps-icms-lal

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 24 2012, 01:37.

Description

Merge branch 'lammps-lal' into lammps-icms-lal

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS86b6a0044923: Merge branch 'lammps-lal' into lammps-icms-lal (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 24 2012, 01:37

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
a7e57915f70cW. Michael Brown
Added a header needed to compile with Cray cce. 
Jan 23 2012
5da8da06ab12W. Michael Brown
Moving the order of bool variables in lal_table to match constructor assignment. 
Jan 23 2012
acca720c4288W. Michael Brown
Merge branch 'master' of https://bitbucket.org/wb8/lal 
Jan 23 2012
038497434662Nguyen
Made separate kernels for different table styles, removed inline functions 
Jan 23 2012
be352c7ff761W. Michael Brown
Merge ssh://lens.ccs.ornl.gov/~/git/lammps 
Jan 22 2012
6946fb516f1bMike Brown
Merge branch 'master' of http://git.icms.temple.edu/lammps-ro 
Jan 22 2012
10ce8fa895e8W. Michael Brown
Merge ssh://lens.ccs.ornl.gov/~/git/lammps 
Jan 22 2012
bc313165510eTrung Nguyen
Updated doc .txt files for buck/gpu, buck/coul/cut/gpu and buck/coul/long/gpu… 
Jan 21 2012
274c3d38c4d7Nguyen
- Updated geryon lib for Apple OpenCL - Fixed typos in Nvidia.makefile and… 
Jan 21 2012
13c2da0546dfW. Michael Brown
Fixing issue with OpenCL. Unused memory pointers that are arguments to kernels… 
Jan 20 2012
4b0e911573fdW. Michael Brown
Code formatting and added log file for table with bitmap for regression tests. 
Jan 19 2012
dd62b23a1742Trung Nguyen
Fixed bugs with bitmap table/gpu 
Jan 19 2012
f2fc03bf8e2dW. Michael Brown
Making regression test logs consistent with new tests. 
Jan 19 2012
922a9d172d1eW. Michael Brown
Renaming eam/alloy/gpu tests. 
Jan 18 2012
5870b4fff77bW. Michael Brown
Merge branch 'master' of https://bitbucket.org/wb8/lal 
Jan 18 2012
eedce7ae8971W. Michael Brown
Cleaning up code formatting. 
Jan 18 2012
9fc0083f6a91Nguyen
Updated the potential table with two entries 
Jan 18 2012
7f703cb29a5fNguyen
Rearranged pair table/gpu kernels, bugs in bitmap style 
Jan 18 2012
67362186addfNguyen
Added tests for two-type eam 
Jan 18 2012
9536e6921158W. Michael Brown
Cleaning up new regression tests. Fresh run of all tests for CPU/GPU. Table… 
Jan 18 2012
ef3365d3ff86W. Michael Brown
Renaming some regression tests. Removing eam energy conservation test. Adding… 
Jan 17 2012
981383436da8W. Michael Brown
Fixing bug in neighbor build to prevent copy of host neighbor list when the… 
Jan 17 2012
52ec090bd648W. Michael Brown
Merge branch 'master' of ssh://yona.ccs.ornl.gov/~/git/lammps 
Jan 9 2012
949937d725c6Mike Brown
Merge branch 'master' of http://git.icms.temple.edu/lammps-ro 
Jan 9 2012
b7cece5210f8W. Michael Brown
Merge branch 'master' of https://bitbucket.org/wb8/lal 
Jan 9 2012
fa369317d147W. Michael Brown
Setting the fft times to 0 for the real-space partition when verlet/split is… 
Dec 22 2011
daa6b1a6a773Mike Brown
Merge branch 'master' of http://git.icms.temple.edu/lammps-ro 
Dec 22 2011
6844100cbbb9W. Michael Brown
Fixing some bugs introduced in the last commit for PPPM. 
Dec 21 2011
ea067ec4e65eTrung Nguyen
Improved the 2nd kernel eam/lj just a little bit 
Dec 21 2011
04034b61789eW. Michael Brown
Updates to support pppm/gpu with verlet/split. Updates from Steve for using… 
Dec 21 2011
771b45690752W. Michael Brown
Changes to pppm to support verlet/split. Not yet working. 
Dec 21 2011
abb538b81420Nguyen
Added eam/lj/gpu 
Dec 20 2011
75cb370d34f9W. Michael Brown
Moving fp array resize for EAM before the inum check to prevent segmentation… 
Dec 19 2011
d8657857868eW. Michael Brown
Moving energy pointer offset to only happen with eflag in eam. Adding some… 
Dec 19 2011
7d47a0f6b93bNguyen
Fixed a bug with storing fp to incorrect indices 
Dec 19 2011
4b180c8a31ceW. Michael Brown
Removing comments from fast kernels. 
Dec 19 2011
dbde8f425bfdTrung Nguyen
Fixing bugs in eam/gpu, force compute still not working properly for 2 atom… 
Dec 17 2011
3bcd98d4f112W. Michael Brown
Merge branch 'master' of ssh://firefly9.ornl.gov/~/code/lammps 
Dec 16 2011
ac97aa3e9414W. Michael Brown
Adding a int2 type. 
Dec 16 2011
e369a44400c5W. Michael Brown
Merge branch 'master' of ssh://yona.ccs.ornl.gov/~/git/lammps 
Dec 16 2011
e333a11b5945Mike Brown
Merge branch 'master' of http://git.icms.temple.edu/lammps-ro 
Dec 16 2011
b7a2dc6eba60W. Michael Brown
Geryon update. 
Dec 16 2011
21778b853139W. Michael Brown
Merge branch 'master' of https://bitbucket.org/wb8/lal 
Dec 14 2011
7f9dc9a8a976W. Michael Brown
Adding files removed from the last sync with main lammps. 
Dec 14 2011
40cadfabf5edW. Michael Brown
Merge branch 'master' of ssh://yona.ccs.ornl.gov/~/git/lammps 
Dec 14 2011
145ec27e2be5Mike Brown
Fixes that didn't get incorporated in last merge. 
Dec 14 2011
c8f9dde96262Mike Brown
Merge branch 'master' of http://git.icms.temple.edu/lammps-ro 
Dec 14 2011
dbbe077dc2f4Nguyen
clear the first-part kernels in the eam destructor 
Dec 7 2011
b2bc6488fc03Nguyen
Fixed typos in Opencl.makefile to make opencl build works 
Dec 5 2011
3aa095df1569W. Michael Brown
Removing the write-only qualifier from the device fp allocation. 
Dec 5 2011