|
|
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 |
|
|
|
f90ce18f3d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7133 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-20 00:11:49 +00:00 |
|
|
|
78b0055319
|
Merge branch 'ak-fix' into openmp-step2
Resolved Conflicts:
src/COLLOID/pair_colloid.cpp
src/pair_table.cpp
|
2011-09-24 13:55:42 -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 |
|
|
|
ad5127c52a
|
remove definition of PI from classes
|
2011-09-21 19:38:57 -04:00 |
|
|
|
488eca7165
|
implemented improved timer class
|
2011-08-26 18:39:14 -04:00 |
|
|
|
37df8b5cf0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6477 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-29 14:52:56 +00:00 |
|
|
|
85aa73903c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6476 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-28 16:07:57 +00:00 |
|
|
|
232e444f06
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6445 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-20 15:11:05 +00:00 |
|
|
|
dfb085b321
|
Added triclinic cell keywords and tilt factor scaling options
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6432 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-16 16:30:04 +00:00 |
|
|
|
033b04a969
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6175 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-20 16:05:35 +00:00 |
|
|
|
3a720230d9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5724 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-02-23 15:25:00 +00:00 |
|
|
|
de9dfe44d4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5562 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-18 15:23:32 +00:00 |
|
|
|
9b00fc4b99
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5548 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-14 16:04:55 +00:00 |
|
|
|
d5b494397e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5547 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-14 15:53:06 +00:00 |
|
|
|
82ec94916d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5520 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-11 00:41:00 +00:00 |
|
|
|
4bc2d6f332
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5519 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-10 20:22:06 +00:00 |
|
|
|
140cdf9485
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5504 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-07 21:42:19 +00:00 |
|
|
|
01db59bea3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5498 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-06 23:23:37 +00:00 |
|
|
|
55e8b2bee6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5476 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-05 00:29:35 +00:00 |
|
|
|
d5aa03447b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5457 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-04 19:12:58 +00:00 |
|
|
|
b015f75194
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4745 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-08 23:41:16 +00:00 |
|
|
|
e3c75de17a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4485 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-12 23:26:29 +00:00 |
|
|
|
514421d8fb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4475 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-10 15:18:01 +00:00 |
|
|
|
422c33713b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4257 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-06-15 19:08:46 +00:00 |
|
|
|
f7dfc72b4f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4177 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-05-21 16:00:17 +00:00 |
|
|
|
2629df5790
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4167 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-05-20 17:04:06 +00:00 |
|
|
|
e00095d335
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3871 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-03-03 18:40:02 +00:00 |
|
|
|
ed9d475897
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3791 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-02-08 21:41:24 +00:00 |
|
|
|
8b6877e6d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3512 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-12-09 21:12:49 +00:00 |
|
|
|
97cfbf8fb4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3508 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-12-04 21:03:54 +00:00 |
|
|
|
db40cbe7b7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3489 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-12-03 20:54:54 +00:00 |
|
|
|
1d79de28b3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3087 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-08-18 17:54:17 +00:00 |
|
|
|
70378d5ef4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3067 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-08-13 17:33:39 +00:00 |
|
|
|
746690d402
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2958 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-07-02 18:01:55 +00:00 |
|
|
|
c318361d2f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2937 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-07-01 20:28:37 +00:00 |
|
|
|
721d689f93
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2748 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-04-10 23:20:41 +00:00 |
|
|
|
25baa261e9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2364 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-01-09 21:31:31 +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 |
|
|
|
97bcc0c23d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2268 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-12-02 20:18:44 +00:00 |
|
|
|
892fb116cd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1608 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-03-17 23:37:19 +00:00 |
|
|
|
6ba8c45983
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1582 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-03-10 17:49:50 +00:00 |
|
|
|
c6aa79e008
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1463 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-02-06 00:03:11 +00:00 |
|
|
|
f953536132
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1386 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-01-17 23:46:47 +00:00 |
|
|
|
227f28c324
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1372 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-01-17 17:01:57 +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 |
|
|
|
8ec82f42e0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1227 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-12-10 20:49:32 +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 |
|
|
|
5dd9bf8caa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1124 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-11-02 22:01:18 +00:00 |
|
|
|
6de4e59a38
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1119 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-11-02 20:25:11 +00:00 |
|
