Merge branch 'master' into openmp-step6
31dc359e82f6
Actions

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 21 2011, 21:50

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSb1492a195bb8: fix race conditions and omissions in ewald/omp
rLAMMPSfa80bceb30d0: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7163 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

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

Commit	Author	Details	Committed
fa80bceb30d0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7163 f3b2605a-c512-4ea7…	Oct 20 2011
8d409d8f2ee2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7162 f3b2605a-c512-4ea7…	Oct 20 2011
30242a51bdc6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7161 f3b2605a-c512-4ea7…	Oct 20 2011
5cd9c6fe0001	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7160 f3b2605a-c512-4ea7…	Oct 20 2011
5667c71730bc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7158 f3b2605a-c512-4ea7…	Oct 20 2011
ac909b6e1814	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7157 f3b2605a-c512-4ea7…	Oct 20 2011
4322b98c8e6d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7156 f3b2605a-c512-4ea7…	Oct 20 2011
8287969efa32	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7155 f3b2605a-c512-4ea7…	Oct 20 2011
fd155252ea24	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7154 f3b2605a-c512-4ea7…	Oct 20 2011
8dfec21cf449	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7153 f3b2605a-c512-4ea7…	Oct 20 2011
522e626bc959	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7152 f3b2605a-c512-4ea7…	Oct 20 2011
29ce252d9ab3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7151 f3b2605a-c512-4ea7…	Oct 20 2011
35aaafdfa750	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7150 f3b2605a-c512-4ea7…	Oct 20 2011
b0f09063e0ee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7149 f3b2605a-c512-4ea7…	Oct 20 2011
89a39c742569	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7148 f3b2605a-c512-4ea7…	Oct 20 2011
c6d228775fc0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7147 f3b2605a-c512-4ea7…	Oct 20 2011
ca8dfd3d7c07	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7146 f3b2605a-c512-4ea7…	Oct 20 2011
83b55b844c9f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7145 f3b2605a-c512-4ea7…	Oct 20 2011
6cebfc12b5c9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7144 f3b2605a-c512-4ea7…	Oct 20 2011
a053fd478801	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7143 f3b2605a-c512-4ea7…	Oct 20 2011
10a6791ea2bf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7142 f3b2605a-c512-4ea7…	Oct 20 2011
dcbe4d90bac3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7141 f3b2605a-c512-4ea7…	Oct 20 2011
1049b963d7aa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7140 f3b2605a-c512-4ea7…	Oct 20 2011
497290eadc9c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7138 f3b2605a-c512-4ea7…	Oct 20 2011
ae247d982aec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7137 f3b2605a-c512-4ea7…	Oct 20 2011
f90ce18f3db4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7133 f3b2605a-c512-4ea7…	Oct 20 2011
55b951bed074	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7128 f3b2605a-c512-4ea7…	Oct 20 2011
df52f93e5ebf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7098 f3b2605a-c512-4ea7…	Oct 17 2011
eae3431926f0	athomps	Added note about omega	Oct 14 2011
d8df399c7f08	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7088 f3b2605a-c512-4ea7…	Oct 13 2011
d2a730bc4031	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7071 f3b2605a-c512-4ea7…	Oct 10 2011
850a3cf8a4de	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7069 f3b2605a-c512-4ea7…	Oct 10 2011
49573998e714	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7068 f3b2605a-c512-4ea7…	Oct 10 2011
855e2aa3538e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7067 f3b2605a-c512-4ea7…	Oct 10 2011
90a5d2b322bf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7066 f3b2605a-c512-4ea7…	Oct 10 2011
e6a0e39b5070	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7065 f3b2605a-c512-4ea7…	Oct 10 2011
2e2abb3a7271	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7063 f3b2605a-c512-4ea7…	Oct 10 2011
789f069c2bc8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7062 f3b2605a-c512-4ea7…	Oct 10 2011
6d849fea0e36	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7061 f3b2605a-c512-4ea7…	Oct 10 2011
76da1a753ba1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7059 f3b2605a-c512-4ea7…	Oct 10 2011
6a2a96053c40	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7058 f3b2605a-c512-4ea7…	Oct 10 2011
c1bfbd8e6165	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7057 f3b2605a-c512-4ea7…	Oct 10 2011
2182b0443bba	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7049 f3b2605a-c512-4ea7…	Oct 8 2011
4591d9958dbb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7048 f3b2605a-c512-4ea7…	Oct 8 2011
c8fa1bd5df84	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7047 f3b2605a-c512-4ea7…	Oct 8 2011
504227e2e602	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7046 f3b2605a-c512-4ea7…	Oct 8 2011
3e908537397e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7045 f3b2605a-c512-4ea7…	Oct 8 2011

Changes (200)

		Path
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_intro.html
M		doc/Section_intro.txt
M		doc/Section_modify.html
M		doc/Section_modify.txt
M		doc/Section_start.html
M		doc/Section_start.txt
M		doc/atom_style.html
M		doc/atom_style.txt
M		doc/compute_erotate_asphere.html
M		doc/compute_erotate_asphere.txt
M		doc/compute_property_atom.html
M		doc/compute_property_atom.txt
M		doc/fix.html
M		doc/fix.txt
A		doc/fix_nve_line.html
A		doc/fix_nve_line.txt
A		doc/fix_nve_tri.html
A		doc/fix_nve_tri.txt
M		doc/fix_rigid.html
M		doc/fix_rigid.txt
M		doc/fix_srd.html
M		doc/fix_srd.txt
M		doc/pair_coeff.html
M		doc/pair_coeff.txt
A		doc/pair_line_lj.html
A		doc/pair_line_lj.txt
M		doc/pair_style.html
M		doc/pair_style.txt
M		doc/pair_sw.html
M		doc/pair_sw.txt
M		doc/pair_tersoff.html
M		doc/pair_tersoff.txt
A		doc/pair_tri_lj.html
A		doc/pair_tri_lj.txt
M		doc/read_data.html
M		doc/read_data.txt
M		doc/set.html
M		doc/set.txt
M		examples/README
A	(dir)	examples/dreiding/
A		examples/dreiding/README
A		examples/dreiding/ch3oh.box.dreiding.bgf
A		examples/dreiding/ch3oh.box.dreiding.cerius2.eng.dat
A		examples/dreiding/data.dreiding
A		examples/dreiding/in.dreiding
A		examples/dreiding/log.dreiding.11Oct11.linux.1
A		examples/dreiding/log.dreiding.11Oct11.linux.4
M		lib/cuda/Makefile.defaults
M		lib/cuda/Makefile.lammps
V		{lib/cuda ← src/USER-CUDA}/cuda_common.h
M		lib/cuda/cuda_pair.cu
M		lib/cuda/cuda_pair_kernel.cu
M		lib/cuda/cuda_pair_virial_kernel_nc.cu
M		lib/cuda/cuda_precision.h
M		lib/cuda/cuda_shared.h
M		lib/cuda/neighbor.cu
M		lib/cuda/neighbor_kernel.cu
A		lib/cuda/pair_manybody_const.h
A		lib/cuda/pair_sw_cuda.cu
A		lib/cuda/pair_sw_cuda_cu.h
A		lib/cuda/pair_sw_cuda_kernel_nc.cu
A		lib/cuda/pair_tersoff_cuda.cu
A		lib/cuda/pair_tersoff_cuda_cu.h
A		lib/cuda/pair_tersoff_cuda_kernel_nc.cu
M		lib/gpu/Makefile.linux
M		src/ASPHERE/Install.sh
M		src/ASPHERE/compute_erotate_asphere.cpp
P		src/ASPHERE/compute_erotate_asphere.h Copied to multiple locations: src/ASPHERE/fix_nve_line.h src/ASPHERE/fix_nve_tri.h
A		src/ASPHERE/fix_nve_line.cpp
P		src/ASPHERE/fix_nve_line.h Copied from src/ASPHERE/compute_erotate_asphere.h
A		src/ASPHERE/fix_nve_tri.cpp
P		src/ASPHERE/fix_nve_tri.h Copied from src/ASPHERE/compute_erotate_asphere.h
A		src/ASPHERE/pair_line_lj.cpp
P		src/ASPHERE/pair_line_lj.h Copied from src/pair_soft.h
A		src/ASPHERE/pair_tri_lj.cpp
P		src/ASPHERE/pair_tri_lj.h Copied from src/pair_soft.h
M		src/CLASS2/angle_class2.cpp
M		src/CLASS2/dihedral_class2.cpp
M		src/CLASS2/dihedral_class2.h
M		src/CLASS2/improper_class2.cpp
M		src/CLASS2/improper_class2.h
M		src/CLASS2/pair_lj_class2.cpp
M		src/CLASS2/pair_lj_class2_coul_cut.cpp
M		src/CLASS2/pair_lj_class2_coul_long.cpp
M		src/COLLOID/pair_lubricate.cpp
M		src/GPU/pppm_gpu.cpp
M		src/GRANULAR/fix_pour.cpp
M		src/GRANULAR/fix_pour.h
M		src/GRANULAR/fix_wall_gran.cpp
M		src/KSPACE/ewald.cpp
M		src/KSPACE/ewald.h
M		src/KSPACE/pair_born_coul_long.cpp
M		src/KSPACE/pair_buck_coul_long.cpp
M		src/KSPACE/pair_lj_cut_coul_long.cpp
M		src/MAKE/Makefile.g++
M		src/MAKE/Makefile.serial
M		src/MANYBODY/pair_airebo.cpp
M		src/MANYBODY/pair_comb.cpp
M		src/MANYBODY/pair_comb.h
M		src/MANYBODY/pair_tersoff.h
M		src/MC/fix_gcmc.cpp
M		src/MOLECULE/angle_charmm.cpp
M		src/MOLECULE/angle_cosine.cpp
M		src/MOLECULE/angle_cosine_periodic.cpp
M		src/MOLECULE/angle_cosine_squared.cpp
M		src/MOLECULE/angle_harmonic.cpp
M		src/MOLECULE/angle_table.cpp
M		src/MOLECULE/dihedral_charmm.cpp
M		src/MOLECULE/dihedral_helix.cpp
M		src/MOLECULE/improper_harmonic.cpp
M		src/MOLECULE/improper_umbrella.cpp
M		src/MOLECULE/pair_hbond_dreiding_lj.cpp
M		src/MOLECULE/pair_hbond_dreiding_lj.h
M		src/MOLECULE/pair_hbond_dreiding_morse.cpp
M		src/SHOCK/fix_append_atoms.cpp
M		src/SRD/fix_srd.cpp
M		src/SRD/fix_srd.h
M		src/USER-CG-CMM/angle_cg_cmm.cpp
M		src/USER-CG-CMM/pair_cmm_common.cpp
M		src/USER-CUDA/Install.sh
M		src/USER-CUDA/comm_cuda.cpp
M		src/USER-CUDA/cuda.cpp
V		{src/USER-CUDA → lib/cuda}/cuda_common.h
D		src/USER-CUDA/cuda_precision.h
D		src/USER-CUDA/cuda_shared.h
M		src/USER-CUDA/fix_gravity_cuda.cpp
M		src/USER-CUDA/fix_shake_cuda.cpp
M		src/USER-CUDA/fix_shake_cuda.h
M		src/USER-CUDA/neighbor_cuda.cpp
A		src/USER-CUDA/pair_sw_cuda.cpp
A		src/USER-CUDA/pair_sw_cuda.h
A		src/USER-CUDA/pair_tersoff_cuda.cpp
A		src/USER-CUDA/pair_tersoff_cuda.h
A		src/USER-CUDA/pair_tersoff_zbl_cuda.cpp
A		src/USER-CUDA/pair_tersoff_zbl_cuda.h
M		src/USER-CUDA/pppm_cuda.cpp
M		src/USER-CUDA/verlet_cuda.cpp
M		src/USER-EFF/atom_vec_electron.h
M		src/USER-OMP/Install.sh
M		src/USER-OMP/Package.sh
A		src/USER-OMP/README
M		src/USER-OMP/dihedral_helix_omp.cpp
M		src/USER-OMP/dihedral_multi_harmonic_omp.cpp
M		src/angle.cpp
M		src/angle.h
M		src/atom.cpp
M		src/atom.h
P		src/atom_vec_ellipsoid.cpp Copied to multiple locations: src/atom_vec_line.cpp src/atom_vec_tri.cpp
P		src/atom_vec_ellipsoid.h Copied to multiple locations: src/atom_vec_line.h src/atom_vec_tri.h
P		src/atom_vec_line.cpp Copied from src/atom_vec_ellipsoid.cpp
P		src/atom_vec_line.h Copied from src/atom_vec_ellipsoid.h
M		src/atom_vec_sphere.cpp
M		src/atom_vec_sphere.h
P		src/atom_vec_tri.cpp Copied from src/atom_vec_ellipsoid.cpp
P		src/atom_vec_tri.h Copied from src/atom_vec_ellipsoid.h
M		src/compute_angle_local.cpp
M		src/compute_dihedral_local.cpp
M		src/compute_improper_local.cpp
M		src/compute_property_atom.cpp
M		src/compute_property_atom.h
M		src/compute_rdf.cpp
M		src/dihedral.cpp
M		src/dihedral.h
M		src/dump_image.cpp
M		src/dump_image.h
M		src/fix_adapt.cpp
M		src/fix_addforce.cpp
M		src/fix_deform.cpp
M		src/fix_gravity.cpp
M		src/fix_move.cpp
M		src/fix_orient_fcc.cpp
M		src/fix_orient_fcc.h
M		src/fix_restrain.cpp
M		src/fix_rigid.cpp
M		src/fix_rigid.h
M		src/fix_shake.cpp
M		src/fix_shake.h
M		src/improper.cpp
M		src/improper.h
M		src/input.cpp
M		src/lammps.cpp
M		src/pair_born.cpp
M		src/pair_buck.cpp
M		src/pair_buck_coul_cut.cpp
M		src/pair_hybrid.cpp
M		src/pair_lj96_cut.cpp
M		src/pair_lj_cut.cpp
M		src/pair_lj_cut_coul_cut.cpp
M		src/pair_lj_expand.cpp
M		src/pair_soft.cpp
P		src/pair_soft.h Copied to multiple locations: src/ASPHERE/pair_line_lj.h src/ASPHERE/pair_tri_lj.h
M		src/read_data.cpp
M		src/read_data.h
M		src/set.cpp
M		src/set.h
M		src/thermo.cpp
M		src/version.h
M		tools/amber2lmp/amber2lammps.py

Merge branch 'master' into openmp-step631dc359e82f6Actions

Description

Details

Event Timeline

Merged Changes

Changes (200)

rLAMMPS31dc359e82f6

doc/Section_commands.html

doc/Section_commands.txt

doc/Section_intro.html

doc/Section_intro.txt

doc/Section_modify.html

doc/Section_modify.txt

doc/Section_start.html

doc/Section_start.txt

doc/atom_style.html

doc/atom_style.txt

doc/compute_erotate_asphere.html

doc/compute_erotate_asphere.txt

doc/compute_property_atom.html

doc/compute_property_atom.txt

doc/fix.html

doc/fix.txt

doc/fix_nve_line.html

doc/fix_nve_line.txt

doc/fix_nve_tri.html

doc/fix_nve_tri.txt

doc/fix_rigid.html

doc/fix_rigid.txt

doc/fix_srd.html

doc/fix_srd.txt

doc/pair_coeff.html

doc/pair_coeff.txt

doc/pair_line_lj.html

doc/pair_line_lj.txt

doc/pair_style.html

doc/pair_style.txt

doc/pair_sw.html

doc/pair_sw.txt

doc/pair_tersoff.html

doc/pair_tersoff.txt

doc/pair_tri_lj.html

doc/pair_tri_lj.txt

doc/read_data.html

doc/read_data.txt

doc/set.html

doc/set.txt

examples/README

examples/dreiding/README

examples/dreiding/ch3oh.box.dreiding.bgf

examples/dreiding/ch3oh.box.dreiding.cerius2.eng.dat

examples/dreiding/data.dreiding

examples/dreiding/in.dreiding

examples/dreiding/log.dreiding.11Oct11.linux.1

examples/dreiding/log.dreiding.11Oct11.linux.4

lib/cuda/Makefile.defaults

lib/cuda/Makefile.lammps

lib/cuda/cuda_common.h

lib/cuda/cuda_pair.cu

lib/cuda/cuda_pair_kernel.cu

lib/cuda/cuda_pair_virial_kernel_nc.cu

lib/cuda/cuda_precision.h

lib/cuda/cuda_shared.h

lib/cuda/neighbor.cu

lib/cuda/neighbor_kernel.cu

lib/cuda/pair_manybody_const.h

lib/cuda/pair_sw_cuda.cu

lib/cuda/pair_sw_cuda_cu.h

lib/cuda/pair_sw_cuda_kernel_nc.cu

lib/cuda/pair_tersoff_cuda.cu

lib/cuda/pair_tersoff_cuda_cu.h

lib/cuda/pair_tersoff_cuda_kernel_nc.cu

lib/gpu/Makefile.linux

src/ASPHERE/Install.sh

src/ASPHERE/compute_erotate_asphere.cpp

src/ASPHERE/compute_erotate_asphere.h

src/ASPHERE/fix_nve_line.cpp

src/ASPHERE/fix_nve_line.h

src/ASPHERE/fix_nve_tri.cpp

src/ASPHERE/fix_nve_tri.h

Merge branch 'master' into openmp-step6
31dc359e82f6
Actions