|
|
3295bdbec0
|
Merge branch 'openmp-next-merge' into openmp-master
Resolved Conflicts:
doc/fix_wall_reflect.txt
src/GPU/fix_gpu.cpp
src/USER-CUDA/verlet_cuda.cpp
src/min.cpp
src/neigh_full.cpp
src/neigh_request.cpp
src/respa.cpp
|
2011-10-25 08:40:55 -04:00 |
|
|
|
c6bbdcfbf2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7184 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-24 20:28:02 +00: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 |
|
|
|
f1b4f88d27
|
support suffix handling for kspace styles
|
2011-10-18 01:46:33 -04:00 |
|
|
|
c1bfbd8e61
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7057 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-10 14:58:50 +00:00 |
|
|
|
af967c6070
|
create fix omp instance with package omp command
|
2011-10-09 19:54:17 -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 |
|
|
|
e23e68a509
|
expand suffix handling in input processing
|
2011-10-03 22:18:18 -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 |
|
|
|
1490fa2606
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6759 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-23 15:25:59 +00:00 |
|
|
|
b416be6cbc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6710 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-17 21:37:24 +00:00 |
|
|
|
ba299cf0eb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6700 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-17 14:24:44 +00:00 |
|
|
|
aedbb28b6c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6486 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-30 20:10:18 +00:00 |
|
|
|
c76fd4256e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6315 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-07 17:14:35 +00:00 |
|
|
|
d9824c7583
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6305 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-07 15:25:20 +00:00 |
|
|
|
1f19be90b8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6287 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-01 17:34:26 +00:00 |
|
|
|
5bf395f4d7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6263 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-31 22:36:53 +00:00 |
|
|
|
ab5592e67b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6221 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-26 22:45:42 +00:00 |
|
|
|
0ca2e3b389
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6217 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-26 22:00:16 +00:00 |
|
|
|
e97e40698a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6209 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-23 14:04:44 +00:00 |
|
|
|
ad89319d7c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6201 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-20 23:39:34 +00:00 |
|
|
|
3ae193256b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6196 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-20 22:59:15 +00:00 |
|
|
|
e5693fb5db
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6180 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-20 16:16:48 +00:00 |
|
|
|
ae07e039c5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6157 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-20 15:53:02 +00:00 |
|
|
|
819524ebd6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5932 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-04-13 21:40:14 +00:00 |
|
|
|
1f2a7add78
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5836 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-26 00:50:29 +00:00 |
|
|
|
bad635f636
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5745 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-03-07 21:52:28 +00:00 |
|
|
|
89cbe1ceeb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5591 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-02-04 19:13:14 +00:00 |
|
|
|
bcaa5adb67
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5345 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-12-01 00:12:51 +00:00 |
|
|
|
5d66783527
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5343 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-12-01 00:01:42 +00:00 |
|
|
|
03869e4781
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5336 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-11-29 17:57:09 +00:00 |
|
|
|
31e65b4e72
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5258 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-11-18 17:28:47 +00:00 |
|
|
|
460379ce20
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5250 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-11-17 18:25:24 +00:00 |
|
|
|
b57959fe8a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4867 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-27 17:33:53 +00:00 |
|
|
|
5b6e639485
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4748 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-09-09 00:01:34 +00:00 |
|
|
|
27e8888127
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4433 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-08-04 15:10:00 +00:00 |
|
|
|
841a27b442
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4163 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-05-20 15:53:39 +00:00 |
|
|
|
c25a8ad426
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3743 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-01-23 23:20:49 +00:00 |
|
|
|
46a7dc9db8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3734 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-01-20 15:12:36 +00:00 |
|
|
|
fae7fd7621
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3730 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-01-19 17:56:46 +00:00 |
|
|
|
1dbad849b7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3674 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-01-13 20:55:06 +00:00 |
|
|
|
2c643b7dc5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3655 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2010-01-12 01:37:48 +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 |
|
|
|
71fbecea76
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2286 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-12-04 19:47:29 +00:00 |
|
|
|
e520a220a3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1840 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-05-16 21:58:06 +00:00 |
|
|
|
fada174882
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1279 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2008-01-03 18:57:32 +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 |
|
|
|
a5eda24459
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1249 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-12-13 14:33:56 +00:00 |
|
|
|
9c1c10e1c4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1091 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-10-22 23:26:34 +00:00 |
|
|
|
5c09d455db
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@778 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-08-07 13:13:03 +00:00 |
|
