Axel Kohlmeyer 0f7f4a1e43 Merge remote branch 'lammps-ro/master' into lammps-icms ...

Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
	lib/gpu/lal_device.cpp

2014-03-21 13:58:34 +01:00

..

fix_gpu.cpp

Merge remote branch 'lammps-ro/master' into lammps-icms

2014-03-21 13:58:34 +01:00

fix_gpu.h

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

2014-01-30 07:54:10 -05:00

gpu_extra.h

anticipate 1 Feb 2014 patch from upstream

2014-01-30 17:21:25 -05:00

Install.sh

Merge remote branch 'lammps-ro/master' into lammps-icms

2014-03-21 13:58:34 +01:00

pair_beck_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_beck_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10671 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-08-23 14:47:13 +00:00

pair_born_coul_long_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_born_coul_long_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9566 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-03-04 23:09:29 +00:00

pair_born_coul_wolf_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_born_coul_wolf_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9566 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-03-04 23:09:29 +00:00

pair_born_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_born_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9566 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-03-04 23:09:29 +00:00

pair_buck_coul_cut_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_buck_coul_cut_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_buck_coul_long_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_buck_coul_long_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_buck_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_buck_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_colloid_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_colloid_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9566 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-03-04 23:09:29 +00:00

pair_coul_dsf_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_coul_dsf_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8815 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-09-21 16:09:24 +00:00

pair_coul_long_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_coul_long_gpu.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_dpd_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11662 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-03-20 15:00:59 +00:00

pair_dpd_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11662 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-03-20 15:00:59 +00:00

pair_dpd_tstat_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11662 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-03-20 15:00:59 +00:00

pair_dpd_tstat_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11662 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-03-20 15:00:59 +00:00

pair_eam_alloy_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8814 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-09-21 16:08:57 +00:00

pair_eam_alloy_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_eam_fs_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8814 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-09-21 16:08:57 +00:00

pair_eam_fs_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_eam_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_eam_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8498 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-07-25 15:16:20 +00:00

pair_gauss_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_gauss_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9566 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-03-04 23:09:29 +00:00

pair_gayberne_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_gayberne_gpu.h

Merge remote branch 'lammps-ro/master' into lammps-icms

2013-06-30 12:41:18 +02:00

pair_lj96_cut_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj96_cut_gpu.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_charmm_coul_long_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_charmm_coul_long_gpu.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_class2_coul_long_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_class2_coul_long_gpu.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_class2_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_class2_gpu.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_cut_coul_cut_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_cut_coul_cut_gpu.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_cut_coul_debye_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_cut_coul_debye_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8690 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-08-21 13:53:53 +00:00

pair_lj_cut_coul_dsf_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_cut_coul_dsf_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8815 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-09-21 16:09:24 +00:00

pair_lj_cut_coul_long_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_cut_coul_long_gpu.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_cut_coul_msm_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11646 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-03-19 19:00:18 +00:00

pair_lj_cut_coul_msm_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11646 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-03-19 19:00:18 +00:00

pair_lj_cut_dipole_cut_gpu.cpp

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

2014-01-26 21:35:32 -05:00

pair_lj_cut_dipole_cut_gpu.h

permission cleanup

2013-06-28 13:15:10 +02:00

pair_lj_cut_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_cut_gpu.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_expand_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_expand_gpu.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_gromacs_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_gromacs_gpu.h

anticipate 1 Feb 2014 patch from upstream

2014-01-30 17:21:25 -05:00

pair_lj_sdk_coul_long_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_sdk_coul_long_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_lj_sdk_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_lj_sdk_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_lj_sf_dipole_sf_gpu.cpp

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

2014-01-26 21:35:32 -05:00

pair_lj_sf_dipole_sf_gpu.h

permission cleanup

2013-06-28 13:15:10 +02:00

pair_mie_cut_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_mie_cut_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10671 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-08-23 14:47:13 +00:00

pair_morse_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_morse_gpu.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_resquared_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_resquared_gpu.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_soft_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_soft_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10671 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-08-23 14:47:13 +00:00

pair_sw_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_sw_gpu.h

anticipate 1 Feb 2014 patch from upstream

2014-01-30 17:21:25 -05:00

pair_table_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_table_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_yukawa_colloid_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_yukawa_colloid_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9566 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-03-04 23:09:29 +00:00

pair_yukawa_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2014-01-25 23:52:50 +00:00

pair_yukawa_gpu.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pppm_gpu.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10670 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-08-23 14:47:08 +00:00

pppm_gpu.h

Merge remote branch 'lammps-ro/master' into lammps-icms

2013-03-05 13:25:28 +01:00