|
|
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 |
|
|
|
ae247d982a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7137 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-20 14:24:16 +00:00 |
|
|
|
30e2516c39
|
bugfix for hybrid pair styles
|
2011-10-17 19:53:49 -04:00 |
|
|
|
a5ab1198ad
|
more obsolete code removed
|
2011-10-07 09:26:54 -04:00 |
|
|
|
a35cb79bc1
|
Merge branch 'master' into openmp-step4
Resolved Conflicts:
doc/Section_accelerate.txt
doc/Section_commands.txt
doc/angle_hybrid.txt
doc/bond_hybrid.txt
doc/dihedral_hybrid.txt
doc/improper_hybrid.txt
doc/suffix.txt
src/MOLECULE/angle_hybrid.cpp
src/MOLECULE/dihedral_hybrid.cpp
src/MOLECULE/improper_hybrid.cpp
src/bond_hybrid.cpp
src/compute_pair.cpp
src/force.cpp
src/pair_hybrid.cpp
|
2011-10-07 08:51:26 -04:00 |
|
|
|
15203cb792
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7039 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-06 17:55:48 +00:00 |
|
|
|
874b02ed8d
|
addi or improve suffix support to force styles
|
2011-10-03 22:05:17 -04:00 |
|
|
|
11e78acd58
|
support use of suffix with hybrid pair styles
|
2011-10-03 16:33:40 -04:00 |
|
|
|
19e8c92a90
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7003 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-09-23 18:06:55 +00:00 |
|
|
|
147842df01
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6327 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-07 18:06:14 +00:00 |
|
|
|
b40cd20066
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6187 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-20 17:14:51 +00:00 |
|
|
|
5f4a69b0b0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6056 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-02 15:05:13 +00:00 |
|
|
|
fbb475b9cd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5835 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-25 21:13:51 +00:00 |
|
|
|
50b8413fe7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5833 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-25 19:40:12 +00:00 |
|
|
|
159d131e37
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5797 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-18 15:09:03 +00:00 |
|
|
|
85f070b25b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5104 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-10-22 21:26:44 +00:00 |
|
|
|
5810937ea9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4685 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-03 23:12:51 +00:00 |
|
|
|
2676e30a50
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4597 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-26 15:27:00 +00:00 |
|
|
|
d89667d740
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4575 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-23 23:31:41 +00:00 |
|
|
|
84495f6ae0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4010 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-04-16 14:28:37 +00:00 |
|
|
|
8951075a0b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3274 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-10-30 22:49:22 +00:00 |
|
|
|
bd0d78aeac
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3054 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-08-12 16:46:29 +00:00 |
|
|
|
c3e5f44e39
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2627 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-03-05 21:28:03 +00:00 |
|
|
|
291fb3b1d3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2577 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-02-12 20:42:48 +00:00 |
|
|
|
22b7dc3ea1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2574 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-02-12 20:14:20 +00:00 |
|
|
|
0cc1d090f4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2330 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-01-05 22:26:08 +00:00 |
|
|
|
e77b2352a8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2247 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-11-21 16:22:04 +00:00 |
|
|
|
7732b4f0c2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2051 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-08-13 14:39:45 +00:00 |
|
|
|
e3bb9d6333
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1554 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-02-22 14:28:58 +00:00 |
|
|
|
d39a8de8ab
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1422 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-01-24 22:30:58 +00:00 |
|
|
|
57c7db4eb1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1320 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-01-05 00:07:25 +00:00 |
|
|
|
b2e9f7dc10
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1272 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-01-02 19:24:46 +00:00 |
|
|
|
6d039d2bb3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1213 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-12-05 19:12:29 +00:00 |
|
|
|
8fb52958ce
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1193 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-11-30 21:54:30 +00:00 |
|
|
|
0f3f037edc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1000 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-10-10 22:22:16 +00:00 |
|
|
|
ed9ce73904
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@954 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-10-04 23:59:26 +00:00 |
|
|
|
7d398e213b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@952 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-10-04 19:21:45 +00:00 |
|
|
|
aef3f32236
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@951 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-10-04 17:57:04 +00:00 |
|
|
|
9be7620ace
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@937 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-10-03 16:22:30 +00:00 |
|
|
|
2a7def33be
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@910 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-09-29 00:08:09 +00:00 |
|
|
|
7b013f9190
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@674 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-06-26 00:04:02 +00:00 |
|
|
|
209f169cbc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@254 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-01-30 00:22:05 +00:00 |
|
|
|
222c95507e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@26 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2006-09-27 19:51:33 +00:00 |
|
