|
|
5acd732f06
|
Merge branch 'master' into openmp-master
|
2011-12-17 18:40:20 -05:00 |
|
|
|
4f48544d41
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7379 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-16 21:15:49 +00:00 |
|
|
|
0c982d0f4a
|
Merge branch 'master' into openmp-master
|
2011-12-08 19:12:31 -05:00 |
|
|
|
9224da83ab
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7303 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-12-08 00:32:34 +00:00 |
|
|
|
ccd5c7b9a1
|
revert to using preprocessor macros for MIN/MAX,
since the templated inline functions create problems
with intel compilers
|
2011-11-14 17:55:02 -05:00 |
|
|
|
b3018aab48
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
doc/fix_wall_reflect.txt
src/MANYBODY/pair_airebo.cpp
src/MANYBODY/pair_airebo.h
src/MANYBODY/pair_comb.cpp
src/MANYBODY/pair_comb.h
src/neigh_list.cpp
|
2011-10-26 14:23:09 -04:00 |
|
|
|
51aef530de
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7195 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-25 16:05:57 +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 |
|
|
|
ca8dfd3d7c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7146 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-20 14:56:49 +00:00 |
|
|
|
9275135c82
|
make MIN/MAX templates instead of macros.
|
2011-09-30 10:37:39 -04:00 |
|
|
|
c18174c0ec
|
Merge branch 'master' into ak-fix
Resolved Conflicts:
src/GPU/pair_cg_cmm_gpu.cpp
src/read_data.cpp
|
2011-09-24 13:49:25 -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 |
|
|
|
fb994b97e5
|
better error handling for read_data
|
2011-08-26 21:09:11 -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 |
|
|
|
1fedcb6e5e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6370 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-13 17:29:06 +00:00 |
|
|
|
889ad4ff5f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6283 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-01 15:52:05 +00:00 |
|
|
|
428bdd0b09
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5992 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-04-21 20:05:45 +00:00 |
|
|
|
ff0cac6cc6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5950 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-04-15 22:57:40 +00:00 |
|
|
|
452107d9cb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5949 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-04-15 22:51:43 +00:00 |
|
|
|
8ff0659bae
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5947 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-04-15 22:25:19 +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 |
|
|
|
d51c47d9ab
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5705 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-02-22 22:09:18 +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 |
|
|
|
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 |
|
|
|
d3eb3d7887
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5466 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-04 20:14:05 +00:00 |
|
|
|
3333f6a924
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5465 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-01-04 20:07:43 +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 |
|
|
|
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 |
|
|
|
3092a34191
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2930 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-06-30 19:31:16 +00:00 |
|
|
|
d32f0a53f2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2676 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2009-03-18 17:37:46 +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 |
|
|
|
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 |
|
|
|
399928b9af
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1268 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-12-19 17:20:18 +00:00 |
|
|
|
cea0208207
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@642 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-06-22 16:59:17 +00:00 |
|
|
|
aaed6ebc33
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@622 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-06-20 13:17:59 +00:00 |
|
|
|
96bdc01670
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@482 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-04-13 15:24:15 +00:00 |
|
|
|
3bf07918d4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@402 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-03-15 23:38:38 +00:00 |
|
|
|
9e1f8bcd6a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@371 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2007-03-08 00:54: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 |
|
