Commit Graph

61 Commits

Author SHA1 Message Date
196e2743f7 gpu library updates from sync with steve 2011-12-02 17:28:12 -05:00
6de5bb6200 include preprocessor updates from mike brown 2011-12-01 11:26:42 -05:00
f7f40f5036 neighbor list bugfix from mike brown 2011-11-28 21:48:08 -05:00
91d8e872fe include LAL bugfixes from mike brown for _DOUBLE_DOUBLE with OpenCL 2011-11-14 20:05:48 -05:00
63dd17808d remove threaded gpu style and update install script for cg/cmm lj/sdk rename 2011-11-08 22:30:00 -05:00
6c74091b2a cosmetic changes. 2011-11-08 18:03:36 -05:00
2b6744cf67 remove msm support from GPU library 2011-11-08 16:57:23 -05:00
0316e0bf9c rename cg/cmm to lj/sdk 2011-11-07 20:52:48 -05:00
320d2d4789 fix typo in package makefile 2011-11-07 15:48:23 -05:00
2483f01648 copy fermi settings to amd/cypress settings and make them active 2011-11-06 18:37:22 -05:00
463d13d99b update list of files/dirs to ignore 2011-11-06 16:00:53 -05:00
ed93f3af3d add example for compilation of OpenCL with nvidia 2011-11-06 15:58:23 -05:00
c1aaa2c1bd provide info for OpenCL compilation 2011-11-06 15:45:39 -05:00
2f4836a100 bugfix from mike brown 2011-11-06 12:00:41 -05:00
0eb377ace6 files to ignore 2011-11-04 19:23:56 -04:00
400e91c22b added placeholder for AMD FirePro3D optimizations 2011-11-04 19:21:09 -04:00
fe583386ec import gpu library snapshot from mike brown 2011-11-04 19:17:12 -04:00
2e98904bba update makefile for coul/long/gpu 2011-11-04 18:31:54 -04:00
31dc359e82 Merge branch 'master' into openmp-step6
Resolved Conflicts:
	src/GPU/pppm_gpu.cpp
	src/KSPACE/ewald.h
	src/MANYBODY/pair_airebo.cpp
	src/MANYBODY/pair_comb.cpp
	src/MANYBODY/pair_comb.h
	src/MANYBODY/pair_tersoff.h
	src/MOLECULE/pair_hbond_dreiding_lj.cpp
	src/MOLECULE/pair_hbond_dreiding_morse.cpp
	src/USER-CUDA/pppm_cuda.cpp
	src/USER-OMP/Install.sh
	src/USER-OMP/Package.sh
	src/USER-OMP/dihedral_charmm_omp.cpp
	src/USER-OMP/dihedral_charmm_omp.h
	src/USER-OMP/dihedral_class2_omp.cpp
	src/USER-OMP/dihedral_class2_omp.h
	src/USER-OMP/dihedral_cosine_shift_exp_omp.cpp
	src/USER-OMP/dihedral_cosine_shift_exp_omp.h
	src/USER-OMP/dihedral_harmonic_omp.cpp
	src/USER-OMP/dihedral_harmonic_omp.h
	src/USER-OMP/dihedral_helix_omp.cpp
	src/USER-OMP/dihedral_helix_omp.h
	src/USER-OMP/dihedral_multi_harmonic_omp.cpp
	src/USER-OMP/dihedral_multi_harmonic_omp.h
	src/USER-OMP/dihedral_opls_omp.cpp
	src/USER-OMP/dihedral_opls_omp.h
	src/USER-OMP/fix_nve_sphere_omp.cpp
	src/USER-OMP/pair_adp_omp.cpp
	src/USER-OMP/pair_adp_omp.h
	src/USER-OMP/pair_born_coul_long_omp.cpp
	src/USER-OMP/pair_born_coul_long_omp.h
	src/USER-OMP/pair_born_omp.cpp
	src/USER-OMP/pair_born_omp.h
	src/USER-OMP/pair_buck_coul_cut_omp.cpp
	src/USER-OMP/pair_buck_coul_cut_omp.h
	src/USER-OMP/pair_buck_coul_long_omp.cpp
	src/USER-OMP/pair_buck_coul_long_omp.h
	src/USER-OMP/pair_buck_coul_omp.cpp
	src/USER-OMP/pair_buck_coul_omp.h
	src/USER-OMP/pair_buck_omp.cpp
	src/USER-OMP/pair_buck_omp.h
	src/USER-OMP/pair_cdeam_omp.cpp
	src/USER-OMP/pair_cdeam_omp.h
	src/USER-OMP/pair_colloid_omp.cpp
	src/USER-OMP/pair_colloid_omp.h
	src/USER-OMP/pair_coul_cut_omp.cpp
	src/USER-OMP/pair_coul_cut_omp.h
	src/USER-OMP/pair_coul_debye_omp.cpp
	src/USER-OMP/pair_coul_debye_omp.h
	src/USER-OMP/pair_coul_long_omp.cpp
	src/USER-OMP/pair_coul_long_omp.h
	src/USER-OMP/pair_dipole_cut_omp.cpp
	src/USER-OMP/pair_dipole_cut_omp.h
	src/USER-OMP/pair_dipole_sf_omp.cpp
	src/USER-OMP/pair_dipole_sf_omp.h
	src/USER-OMP/pair_dpd_omp.cpp
	src/USER-OMP/pair_dpd_omp.h
	src/USER-OMP/pair_dpd_tstat_omp.cpp
	src/USER-OMP/pair_dpd_tstat_omp.h
	src/USER-OMP/pair_eam_omp.cpp
	src/USER-OMP/pair_eam_omp.h
	src/USER-OMP/pair_edip_omp.cpp
	src/USER-OMP/pair_edip_omp.h
	src/USER-OMP/pair_eim_omp.cpp
	src/USER-OMP/pair_eim_omp.h
	src/USER-OMP/pair_gauss_omp.cpp
	src/USER-OMP/pair_gauss_omp.h
	src/USER-OMP/pair_gayberne_omp.cpp
	src/USER-OMP/pair_gayberne_omp.h
	src/USER-OMP/pair_gran_hertz_history_omp.cpp
	src/USER-OMP/pair_gran_hertz_history_omp.h
	src/USER-OMP/pair_gran_hooke_history_omp.cpp
	src/USER-OMP/pair_gran_hooke_history_omp.h
	src/USER-OMP/pair_gran_hooke_omp.cpp
	src/USER-OMP/pair_gran_hooke_omp.h
	src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp
	src/USER-OMP/pair_hbond_dreiding_lj_omp.h
	src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp
	src/USER-OMP/pair_hbond_dreiding_morse_omp.h
	src/USER-OMP/pair_lj96_cut_omp.cpp
	src/USER-OMP/pair_lj96_cut_omp.h
	src/USER-OMP/pair_lj_charmm_coul_charmm_implicit_omp.cpp
	src/USER-OMP/pair_lj_charmm_coul_charmm_implicit_omp.h
	src/USER-OMP/pair_lj_charmm_coul_charmm_omp.cpp
	src/USER-OMP/pair_lj_charmm_coul_charmm_omp.h
	src/USER-OMP/pair_lj_charmm_coul_long_omp.cpp
	src/USER-OMP/pair_lj_charmm_coul_long_omp.h
	src/USER-OMP/pair_lj_class2_coul_cut_omp.cpp
	src/USER-OMP/pair_lj_class2_coul_cut_omp.h
	src/USER-OMP/pair_lj_class2_coul_long_omp.cpp
	src/USER-OMP/pair_lj_class2_coul_long_omp.h
	src/USER-OMP/pair_lj_class2_omp.cpp
	src/USER-OMP/pair_lj_class2_omp.h
	src/USER-OMP/pair_lj_coul_omp.cpp
	src/USER-OMP/pair_lj_coul_omp.h
	src/USER-OMP/pair_lj_cubic_omp.cpp
	src/USER-OMP/pair_lj_cubic_omp.h
	src/USER-OMP/pair_lj_cut_coul_cut_omp.cpp
	src/USER-OMP/pair_lj_cut_coul_cut_omp.h
	src/USER-OMP/pair_lj_cut_coul_debye_omp.cpp
	src/USER-OMP/pair_lj_cut_coul_debye_omp.h
	src/USER-OMP/pair_lj_cut_coul_long_omp.cpp
	src/USER-OMP/pair_lj_cut_coul_long_omp.h
	src/USER-OMP/pair_lj_cut_coul_long_tip4p_omp.cpp
	src/USER-OMP/pair_lj_cut_coul_long_tip4p_omp.h
	src/USER-OMP/pair_lj_cut_omp.cpp
	src/USER-OMP/pair_lj_expand_omp.cpp
	src/USER-OMP/pair_lj_expand_omp.h
	src/USER-OMP/pair_lj_gromacs_coul_gromacs_omp.cpp
	src/USER-OMP/pair_lj_gromacs_coul_gromacs_omp.h
	src/USER-OMP/pair_lj_gromacs_omp.cpp
	src/USER-OMP/pair_lj_gromacs_omp.h
	src/USER-OMP/pair_lj_sf_omp.cpp
	src/USER-OMP/pair_lj_sf_omp.h
	src/USER-OMP/pair_lj_smooth_omp.cpp
	src/USER-OMP/pair_lj_smooth_omp.h
	src/USER-OMP/pair_lubricate_omp.cpp
	src/USER-OMP/pair_lubricate_omp.h
	src/USER-OMP/pair_morse_omp.cpp
	src/USER-OMP/pair_morse_omp.h
	src/USER-OMP/pair_peri_lps_omp.cpp
	src/USER-OMP/pair_peri_lps_omp.h
	src/USER-OMP/pair_peri_pmb_omp.cpp
	src/USER-OMP/pair_peri_pmb_omp.h
	src/USER-OMP/pair_resquared_omp.cpp
	src/USER-OMP/pair_resquared_omp.h
	src/USER-OMP/pair_soft_omp.cpp
	src/USER-OMP/pair_soft_omp.h
	src/USER-OMP/pair_sw_omp.cpp
	src/USER-OMP/pair_sw_omp.h
	src/USER-OMP/pair_table_omp.cpp
	src/USER-OMP/pair_table_omp.h
	src/USER-OMP/pair_tersoff_omp.cpp
	src/USER-OMP/pair_tersoff_omp.h
	src/USER-OMP/pair_yukawa_colloid_omp.cpp
	src/USER-OMP/pair_yukawa_colloid_omp.h
	src/USER-OMP/pair_yukawa_omp.cpp
	src/USER-OMP/pair_yukawa_omp.h
	src/USER-OMP/thr_omp.cpp
	src/USER-OMP/thr_omp.h
	src/read_data.cpp
2011-10-21 15:50:39 -04:00
31868e7aea encode location of cuda library into binary 2011-10-18 17:44:38 -04:00
4591d9958d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7048 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-10-07 23:52:06 +00:00
79e1087146 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7021 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-09-30 16:58:31 +00:00
8aad0f31e0 some small updates and corrections 2011-09-24 14:47:33 -04:00
9a13f65f8d a few more minor GPU cleanups. 2011-08-24 14:03:56 -04:00
c5479893f4 Merge branch 'master' into fermi-mods 2011-08-24 13:43:46 -04:00
541c47f4d4 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6766 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-23 21:12:16 +00:00
7a1f6fc1ee git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6765 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-23 21:11:35 +00:00
61796505fd adjust for local setup. 2011-08-19 18:40:36 -04:00
d22491de17 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6729 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-18 17:32:34 +00:00
84b5b0bef8 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6727 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-18 17:32:05 +00:00
3c1cefdba0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6625 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-08-08 19:51:22 +00:00
945343265e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6407 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-14 13:34:06 +00:00
9418bacff7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6406 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-14 13:33:48 +00:00
479275be1d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6405 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-14 13:32:50 +00:00
98ccbe3e69 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6340 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-06-08 20:24:29 +00:00
14a348470c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6136 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-05-18 20:03:24 +00:00
02ed350cf6 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6079 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-05-08 02:00:08 +00:00
c91cf5f623 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6070 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-05-04 16:27:18 +00:00
bf6bb59386 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6069 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-05-04 16:24:42 +00:00
5f799182b3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6053 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-05-02 15:02:52 +00:00
3480e40e5f git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5906 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-04-07 16:07:43 +00:00
353439c414 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5546 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-01-14 15:14:19 +00:00
a499b28469 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5545 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-01-12 21:41:35 +00:00
2228473d03 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5538 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-01-12 15:25:39 +00:00
8f2257ecbf git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5537 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-01-12 15:24:04 +00:00
4366bfffd3 Getting rid of extra CR characters at ends of lines.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5285 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-23 19:52:03 +00:00
5a82c99485 Changes from Mike Brown.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5277 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-23 00:40:35 +00:00
7900602be9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4065 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-04-28 21:43:36 +00:00
1c9ce032a4 Memory leak bug fix.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3908 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-03-18 23:15:19 +00:00
c0e0b65619 Adding changes from Mike Brown.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3883 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-03-04 22:35:29 +00:00