Merge branch 'master' into lammps-icms
10d6ca2cca1a
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 17 2012, 15:46.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/USER-OMP/fix_omp.cpp
src/USER-OMP/pair_adp_omp.cpp
src/USER-OMP/pair_airebo_omp.cpp
src/USER-OMP/pair_born_coul_long_omp.cpp
src/USER-OMP/pair_born_coul_wolf_omp.cpp
src/USER-OMP/pair_born_omp.cpp
src/USER-OMP/pair_brownian_omp.cpp
src/USER-OMP/pair_brownian_poly_omp.cpp
src/USER-OMP/pair_buck_coul_cut_omp.cpp
src/USER-OMP/pair_buck_coul_long_omp.cpp
src/USER-OMP/pair_buck_coul_omp.cpp
src/USER-OMP/pair_buck_omp.cpp
src/USER-OMP/pair_cdeam_omp.cpp
src/USER-OMP/pair_colloid_omp.cpp
src/USER-OMP/pair_comb_omp.cpp
src/USER-OMP/pair_coul_cut_omp.cpp
src/USER-OMP/pair_coul_debye_omp.cpp
src/USER-OMP/pair_coul_diel_omp.cpp
src/USER-OMP/pair_coul_long_omp.cpp
src/USER-OMP/pair_coul_wolf_omp.cpp
src/USER-OMP/pair_dipole_cut_omp.cpp
src/USER-OMP/pair_dipole_sf_omp.cpp
src/USER-OMP/pair_dpd_omp.cpp
src/USER-OMP/pair_dpd_tstat_omp.cpp
src/USER-OMP/pair_eam_omp.cpp
src/USER-OMP/pair_edip_omp.cpp
src/USER-OMP/pair_eim_omp.cpp
src/USER-OMP/pair_gauss_cut_omp.cpp
src/USER-OMP/pair_gauss_omp.cpp
src/USER-OMP/pair_gayberne_omp.cpp
src/USER-OMP/pair_gran_hertz_history_omp.cpp
src/USER-OMP/pair_gran_hooke_history_omp.cpp
src/USER-OMP/pair_gran_hooke_omp.cpp
src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp
src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp
src/USER-OMP/pair_line_lj_omp.cpp
src/USER-OMP/pair_lj96_cut_omp.cpp
src/USER-OMP/pair_lj_charmm_coul_charmm_implicit_omp.cpp
src/USER-OMP/pair_lj_charmm_coul_charmm_omp.cpp
src/USER-OMP/pair_lj_charmm_coul_long_omp.cpp
src/USER-OMP/pair_lj_charmm_coul_pppm_omp.cpp
src/USER-OMP/pair_lj_class2_coul_cut_omp.cpp
src/USER-OMP/pair_lj_class2_coul_long_omp.cpp
src/USER-OMP/pair_lj_class2_coul_pppm_omp.cpp
src/USER-OMP/pair_lj_class2_omp.cpp
src/USER-OMP/pair_lj_coul_omp.cpp
src/USER-OMP/pair_lj_cubic_omp.cpp
src/USER-OMP/pair_lj_cut_coul_cut_omp.cpp
src/USER-OMP/pair_lj_cut_coul_debye_omp.cpp
src/USER-OMP/pair_lj_cut_coul_long_omp.cpp
src/USER-OMP/pair_lj_cut_coul_long_tip4p_omp.cpp
src/USER-OMP/pair_lj_cut_coul_pppm_omp.cpp
src/USER-OMP/pair_lj_cut_coul_pppm_tip4p_omp.cpp
src/USER-OMP/pair_lj_cut_omp.cpp
src/USER-OMP/pair_lj_expand_omp.cpp
src/USER-OMP/pair_lj_gromacs_coul_gromacs_omp.cpp
src/USER-OMP/pair_lj_gromacs_omp.cpp
src/USER-OMP/pair_lj_sdk_coul_long_omp.cpp
src/USER-OMP/pair_lj_sdk_omp.cpp
src/USER-OMP/pair_lj_sf_omp.cpp
src/USER-OMP/pair_lj_smooth_linear_omp.cpp
src/USER-OMP/pair_lj_smooth_omp.cpp
src/USER-OMP/pair_lubricate_omp.cpp
src/USER-OMP/pair_lubricate_poly_omp.cpp
src/USER-OMP/pair_morse_omp.cpp
src/USER-OMP/pair_peri_lps_omp.cpp
src/USER-OMP/pair_peri_pmb_omp.cpp
src/USER-OMP/pair_resquared_omp.cpp
src/USER-OMP/pair_soft_omp.cpp
src/USER-OMP/pair_sw_omp.cpp
src/USER-OMP/pair_table_omp.cpp
src/USER-OMP/pair_tersoff_omp.cpp
src/USER-OMP/pair_tersoff_table_omp.cpp
src/USER-OMP/pair_tri_lj_omp.cpp
src/USER-OMP/pair_yukawa_colloid_omp.cpp
src/USER-OMP/pair_yukawa_omp.cpp
src/pair.cpp
src/pair.h
src/suffix.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 17 2012, 15:46

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS14c2d79c9c18: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7812 f3b2605a-c512-4ea7…
rLAMMPS7cad945d6172: bugfix for Install.sh scripts.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS10d6ca2cca1a: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 17 2012, 15:46

Merged Changes

Commit	Author	Details	Committed
14c2d79c9c18	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7812 f3b2605a-c512-4ea7…	Feb 16 2012
145abd2a3925	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7810 f3b2605a-c512-4ea7…	Feb 16 2012
b4bc9c69560b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7808 f3b2605a-c512-4ea7…	Feb 16 2012
4589c34e7e9a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7807 f3b2605a-c512-4ea7…	Feb 16 2012
d4a764ed7813	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7806 f3b2605a-c512-4ea7…	Feb 16 2012
80b044e875e1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7805 f3b2605a-c512-4ea7…	Feb 16 2012
f55b74a85f70	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7804 f3b2605a-c512-4ea7…	Feb 16 2012
fa7b92e430b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7803 f3b2605a-c512-4ea7…	Feb 16 2012
e546f9a54b32	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7802 f3b2605a-c512-4ea7…	Feb 16 2012
3ff9f1fa60d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7799 f3b2605a-c512-4ea7…	Feb 16 2012
14318fa30011	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7798 f3b2605a-c512-4ea7…	Feb 16 2012
e35f6365b651	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7797 f3b2605a-c512-4ea7…	Feb 16 2012
2721d93e2cba	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7796 f3b2605a-c512-4ea7…	Feb 15 2012
e963497c6cb1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7795 f3b2605a-c512-4ea7…	Feb 15 2012
14dd64b17a9c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7794 f3b2605a-c512-4ea7…	Feb 15 2012
0be192774732	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7793 f3b2605a-c512-4ea7…	Feb 15 2012

Changes (102)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/change_box.html
	M			doc/change_box.txt
	M			doc/compute_pe_atom.html
	M			doc/compute_pe_atom.txt
	M			doc/compute_stress_atom.html
	M			doc/compute_stress_atom.txt
	M			doc/fix_langevin.html
	M			doc/fix_langevin.txt
	M			examples/kim/in.kim.lj
	M			src/KIM/pair_kim.cpp
	M			src/KIM/pair_kim.h
	M			src/KSPACE/ewald.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_cg.cpp
	M			src/MANYBODY/pair_comb.h
	M			src/USER-OMP/ewald_omp.cpp
	M			src/USER-OMP/fix_omp.cpp
	M			src/USER-OMP/pair_adp_omp.cpp
	M			src/USER-OMP/pair_airebo_omp.cpp
	M			src/USER-OMP/pair_born_coul_long_omp.cpp
	M			src/USER-OMP/pair_born_coul_wolf_omp.cpp
	M			src/USER-OMP/pair_born_omp.cpp
	M			src/USER-OMP/pair_brownian_omp.cpp
	M			src/USER-OMP/pair_brownian_poly_omp.cpp
	M			src/USER-OMP/pair_buck_coul_cut_omp.cpp
	M			src/USER-OMP/pair_buck_coul_long_omp.cpp
	M			src/USER-OMP/pair_buck_coul_omp.cpp
	M			src/USER-OMP/pair_buck_omp.cpp
	M			src/USER-OMP/pair_cdeam_omp.cpp
	M			src/USER-OMP/pair_colloid_omp.cpp
	M			src/USER-OMP/pair_comb_omp.cpp
	M			src/USER-OMP/pair_coul_cut_omp.cpp
	M			src/USER-OMP/pair_coul_debye_omp.cpp
	M			src/USER-OMP/pair_coul_diel_omp.cpp
	M			src/USER-OMP/pair_coul_long_omp.cpp
	M			src/USER-OMP/pair_coul_wolf_omp.cpp
	M			src/USER-OMP/pair_dipole_cut_omp.cpp
	M			src/USER-OMP/pair_dipole_sf_omp.cpp
	M			src/USER-OMP/pair_dpd_omp.cpp
	M			src/USER-OMP/pair_dpd_tstat_omp.cpp
	M			src/USER-OMP/pair_eam_omp.cpp
	M			src/USER-OMP/pair_edip_omp.cpp
	M			src/USER-OMP/pair_eim_omp.cpp
	M			src/USER-OMP/pair_gauss_cut_omp.cpp
	M			src/USER-OMP/pair_gauss_omp.cpp
	M			src/USER-OMP/pair_gayberne_omp.cpp
	M			src/USER-OMP/pair_gran_hertz_history_omp.cpp
	M			src/USER-OMP/pair_gran_hooke_history_omp.cpp
	M			src/USER-OMP/pair_gran_hooke_omp.cpp
	M			src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp
	M			src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp
	M			src/USER-OMP/pair_line_lj_omp.cpp
	M			src/USER-OMP/pair_lj96_cut_omp.cpp
	M			src/USER-OMP/pair_lj_charmm_coul_charmm_implicit_omp.cpp
	M			src/USER-OMP/pair_lj_charmm_coul_charmm_omp.cpp
	M			src/USER-OMP/pair_lj_charmm_coul_long_omp.cpp
	M			src/USER-OMP/pair_lj_charmm_coul_pppm_omp.cpp
	M			src/USER-OMP/pair_lj_class2_coul_cut_omp.cpp
	M			src/USER-OMP/pair_lj_class2_coul_long_omp.cpp
	M			src/USER-OMP/pair_lj_class2_coul_pppm_omp.cpp
	M			src/USER-OMP/pair_lj_class2_omp.cpp
	M			src/USER-OMP/pair_lj_coul_omp.cpp
	M			src/USER-OMP/pair_lj_cubic_omp.cpp
	M			src/USER-OMP/pair_lj_cut_coul_cut_omp.cpp
	M			src/USER-OMP/pair_lj_cut_coul_debye_omp.cpp
	M			src/USER-OMP/pair_lj_cut_coul_long_omp.cpp
	M			src/USER-OMP/pair_lj_cut_coul_long_tip4p_omp.cpp
	M			src/USER-OMP/pair_lj_cut_coul_pppm_omp.cpp
	M			src/USER-OMP/pair_lj_cut_coul_pppm_tip4p_omp.cpp
	M			src/USER-OMP/pair_lj_cut_omp.cpp
	M			src/USER-OMP/pair_lj_expand_omp.cpp
	M			src/USER-OMP/pair_lj_gromacs_coul_gromacs_omp.cpp
	M			src/USER-OMP/pair_lj_gromacs_omp.cpp
	M			src/USER-OMP/pair_lj_sdk_coul_long_omp.cpp
	M			src/USER-OMP/pair_lj_sdk_omp.cpp
	M			src/USER-OMP/pair_lj_sf_omp.cpp
	M			src/USER-OMP/pair_lj_smooth_linear_omp.cpp
	M			src/USER-OMP/pair_lj_smooth_omp.cpp
	M			src/USER-OMP/pair_lubricate_omp.cpp
	M			src/USER-OMP/pair_lubricate_poly_omp.cpp
	M			src/USER-OMP/pair_meam_spline_omp.cpp
	M			src/USER-OMP/pair_morse_omp.cpp
	M			src/USER-OMP/pair_peri_lps_omp.cpp
	M			src/USER-OMP/pair_peri_pmb_omp.cpp
	M			src/USER-OMP/pair_resquared_omp.cpp
	M			src/USER-OMP/pair_soft_omp.cpp
	M			src/USER-OMP/pair_sw_omp.cpp
	M			src/USER-OMP/pair_table_omp.cpp
	M			src/USER-OMP/pair_tersoff_omp.cpp
	M			src/USER-OMP/pair_tersoff_table_omp.cpp
	M			src/USER-OMP/pair_tri_lj_omp.cpp
	M			src/USER-OMP/pair_yukawa_colloid_omp.cpp
	M			src/USER-OMP/pair_yukawa_omp.cpp
	M			src/balance.cpp
	M			src/group.cpp
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_beck.h
	M			src/suffix.h
	M			src/version.h

Merge branch 'master' into lammps-icms10d6ca2cca1aActions

Description

Details

Event Timeline

Merged Changes

Changes (102)Show All Changes

Very Large Commit

rLAMMPS10d6ca2cca1a

doc/change_box.html

doc/change_box.txt

doc/compute_pe_atom.html

doc/compute_pe_atom.txt

doc/compute_stress_atom.html

doc/compute_stress_atom.txt

doc/fix_langevin.html

doc/fix_langevin.txt

examples/kim/in.kim.lj

src/KIM/pair_kim.cpp

src/KIM/pair_kim.h

src/KSPACE/ewald.cpp

src/KSPACE/pppm.cpp

src/KSPACE/pppm_cg.cpp

src/MANYBODY/pair_comb.h

src/USER-OMP/ewald_omp.cpp

src/USER-OMP/fix_omp.cpp

src/USER-OMP/pair_adp_omp.cpp

src/USER-OMP/pair_airebo_omp.cpp

src/USER-OMP/pair_born_coul_long_omp.cpp

src/USER-OMP/pair_born_coul_wolf_omp.cpp

src/USER-OMP/pair_born_omp.cpp

src/USER-OMP/pair_brownian_omp.cpp

src/USER-OMP/pair_brownian_poly_omp.cpp

src/USER-OMP/pair_buck_coul_cut_omp.cpp

src/USER-OMP/pair_buck_coul_long_omp.cpp

src/USER-OMP/pair_buck_coul_omp.cpp

src/USER-OMP/pair_buck_omp.cpp

src/USER-OMP/pair_cdeam_omp.cpp

src/USER-OMP/pair_colloid_omp.cpp

src/USER-OMP/pair_comb_omp.cpp

src/USER-OMP/pair_coul_cut_omp.cpp

src/USER-OMP/pair_coul_debye_omp.cpp

src/USER-OMP/pair_coul_diel_omp.cpp

src/USER-OMP/pair_coul_long_omp.cpp

src/USER-OMP/pair_coul_wolf_omp.cpp

src/USER-OMP/pair_dipole_cut_omp.cpp

src/USER-OMP/pair_dipole_sf_omp.cpp

src/USER-OMP/pair_dpd_omp.cpp

src/USER-OMP/pair_dpd_tstat_omp.cpp

src/USER-OMP/pair_eam_omp.cpp

src/USER-OMP/pair_edip_omp.cpp

src/USER-OMP/pair_eim_omp.cpp

src/USER-OMP/pair_gauss_cut_omp.cpp

src/USER-OMP/pair_gauss_omp.cpp

src/USER-OMP/pair_gayberne_omp.cpp

src/USER-OMP/pair_gran_hertz_history_omp.cpp

src/USER-OMP/pair_gran_hooke_history_omp.cpp

src/USER-OMP/pair_gran_hooke_omp.cpp

src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp

src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp

src/USER-OMP/pair_line_lj_omp.cpp

src/USER-OMP/pair_lj96_cut_omp.cpp

src/USER-OMP/pair_lj_charmm_coul_charmm_implicit_omp.cpp

src/USER-OMP/pair_lj_charmm_coul_charmm_omp.cpp

src/USER-OMP/pair_lj_charmm_coul_long_omp.cpp

src/USER-OMP/pair_lj_charmm_coul_pppm_omp.cpp

src/USER-OMP/pair_lj_class2_coul_cut_omp.cpp

src/USER-OMP/pair_lj_class2_coul_long_omp.cpp

src/USER-OMP/pair_lj_class2_coul_pppm_omp.cpp

src/USER-OMP/pair_lj_class2_omp.cpp

src/USER-OMP/pair_lj_coul_omp.cpp

src/USER-OMP/pair_lj_cubic_omp.cpp

src/USER-OMP/pair_lj_cut_coul_cut_omp.cpp

src/USER-OMP/pair_lj_cut_coul_debye_omp.cpp

src/USER-OMP/pair_lj_cut_coul_long_omp.cpp

src/USER-OMP/pair_lj_cut_coul_long_tip4p_omp.cpp

src/USER-OMP/pair_lj_cut_coul_pppm_omp.cpp

src/USER-OMP/pair_lj_cut_coul_pppm_tip4p_omp.cpp

src/USER-OMP/pair_lj_cut_omp.cpp

src/USER-OMP/pair_lj_expand_omp.cpp

src/USER-OMP/pair_lj_gromacs_coul_gromacs_omp.cpp

Merge branch 'master' into lammps-icms
10d6ca2cca1a
Actions

Changes (102)
Show All Changes