Homec4science

Merge branch 'master' into openmp-step6

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 21 2011, 21:50.

Description

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

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS31dc359e82f6: Merge branch 'master' into openmp-step6 (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 21 2011, 21:50

Merged Changes

CommitAuthorDetailsCommitted
fa80bceb30d0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7163 f3b2605a-c512-4ea7… 
Oct 20 2011
8d409d8f2ee2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7162 f3b2605a-c512-4ea7… 
Oct 20 2011
30242a51bdc6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7161 f3b2605a-c512-4ea7… 
Oct 20 2011
5cd9c6fe0001sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7160 f3b2605a-c512-4ea7… 
Oct 20 2011
5667c71730bcsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7158 f3b2605a-c512-4ea7… 
Oct 20 2011
ac909b6e1814sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7157 f3b2605a-c512-4ea7… 
Oct 20 2011
4322b98c8e6dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7156 f3b2605a-c512-4ea7… 
Oct 20 2011
8287969efa32sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7155 f3b2605a-c512-4ea7… 
Oct 20 2011
fd155252ea24sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7154 f3b2605a-c512-4ea7… 
Oct 20 2011
8dfec21cf449sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7153 f3b2605a-c512-4ea7… 
Oct 20 2011
522e626bc959sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7152 f3b2605a-c512-4ea7… 
Oct 20 2011
29ce252d9ab3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7151 f3b2605a-c512-4ea7… 
Oct 20 2011
35aaafdfa750sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7150 f3b2605a-c512-4ea7… 
Oct 20 2011
b0f09063e0eesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7149 f3b2605a-c512-4ea7… 
Oct 20 2011
89a39c742569sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7148 f3b2605a-c512-4ea7… 
Oct 20 2011
c6d228775fc0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7147 f3b2605a-c512-4ea7… 
Oct 20 2011
ca8dfd3d7c07sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7146 f3b2605a-c512-4ea7… 
Oct 20 2011
83b55b844c9fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7145 f3b2605a-c512-4ea7… 
Oct 20 2011
6cebfc12b5c9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7144 f3b2605a-c512-4ea7… 
Oct 20 2011
a053fd478801sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7143 f3b2605a-c512-4ea7… 
Oct 20 2011
10a6791ea2bfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7142 f3b2605a-c512-4ea7… 
Oct 20 2011
dcbe4d90bac3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7141 f3b2605a-c512-4ea7… 
Oct 20 2011
1049b963d7aasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7140 f3b2605a-c512-4ea7… 
Oct 20 2011
497290eadc9csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7138 f3b2605a-c512-4ea7… 
Oct 20 2011
ae247d982aecsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7137 f3b2605a-c512-4ea7… 
Oct 20 2011
f90ce18f3db4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7133 f3b2605a-c512-4ea7… 
Oct 20 2011
55b951bed074sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7128 f3b2605a-c512-4ea7… 
Oct 20 2011
df52f93e5ebfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7098 f3b2605a-c512-4ea7… 
Oct 17 2011
eae3431926f0athomps
Added note about omega 
Oct 14 2011
d8df399c7f08sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7088 f3b2605a-c512-4ea7… 
Oct 13 2011
d2a730bc4031sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7071 f3b2605a-c512-4ea7… 
Oct 10 2011
850a3cf8a4desjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7069 f3b2605a-c512-4ea7… 
Oct 10 2011
49573998e714sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7068 f3b2605a-c512-4ea7… 
Oct 10 2011
855e2aa3538esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7067 f3b2605a-c512-4ea7… 
Oct 10 2011
90a5d2b322bfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7066 f3b2605a-c512-4ea7… 
Oct 10 2011
e6a0e39b5070sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7065 f3b2605a-c512-4ea7… 
Oct 10 2011
2e2abb3a7271sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7063 f3b2605a-c512-4ea7… 
Oct 10 2011
789f069c2bc8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7062 f3b2605a-c512-4ea7… 
Oct 10 2011
6d849fea0e36sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7061 f3b2605a-c512-4ea7… 
Oct 10 2011
76da1a753ba1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7059 f3b2605a-c512-4ea7… 
Oct 10 2011
6a2a96053c40sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7058 f3b2605a-c512-4ea7… 
Oct 10 2011
c1bfbd8e6165sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7057 f3b2605a-c512-4ea7… 
Oct 10 2011
2182b0443bbasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7049 f3b2605a-c512-4ea7… 
Oct 8 2011
4591d9958dbbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7048 f3b2605a-c512-4ea7… 
Oct 8 2011
c8fa1bd5df84sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7047 f3b2605a-c512-4ea7… 
Oct 8 2011
504227e2e602sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7046 f3b2605a-c512-4ea7… 
Oct 8 2011
3e908537397esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7045 f3b2605a-c512-4ea7… 
Oct 8 2011