Homec4science

Merge branch 'master' of https://bitbucket.org/wb8/lal

Authored by W. Michael Brown <brownw@ornl.gov> on Jan 18 2012, 23:22.

Description

Merge branch 'master' of https://bitbucket.org/wb8/lal

Conflicts:
test/table_linear.gpu.in

Event Timeline

W. Michael Brown <brownw@ornl.gov> committed rLAMMPS5870b4fff77b: Merge branch 'master' of https://bitbucket.org/wb8/lal (authored by W. Michael Brown <brownw@ornl.gov>).Jan 18 2012, 23:22

Merged Changes

CommitAuthorDetailsCommitted
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