Merge branch 'master' into openmp-step4
a35cb79bc19c
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 7 2011, 14:51.

Description

Merge branch 'master' into openmp-step4

Resolved Conflicts:
doc/Section_accelerate.txt
doc/Section_commands.txt
doc/angle_hybrid.txt
doc/bond_hybrid.txt
doc/dihedral_hybrid.txt
doc/improper_hybrid.txt
doc/suffix.txt
src/MOLECULE/angle_hybrid.cpp
src/MOLECULE/dihedral_hybrid.cpp
src/MOLECULE/improper_hybrid.cpp
src/bond_hybrid.cpp
src/compute_pair.cpp
src/force.cpp
src/pair_hybrid.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 7 2011, 14:51

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS608a145e4bb5: added /omp documentation for fix gravity
rLAMMPS1579654c97b0: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7042 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa35cb79bc19c: Merge branch 'master' into openmp-step4 (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 7 2011, 14:51

Merged Changes

Commit	Author	Details	Committed
1579654c97b0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7042 f3b2605a-c512-4ea7…	Oct 6 2011
649c0c437c72	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7041 f3b2605a-c512-4ea7…	Oct 6 2011
0974524f0f9c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7040 f3b2605a-c512-4ea7…	Oct 6 2011
15203cb79244	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7039 f3b2605a-c512-4ea7…	Oct 6 2011
f70a2f893721	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7038 f3b2605a-c512-4ea7…	Oct 6 2011
8f91d37efdc8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7036 f3b2605a-c512-4ea7…	Oct 6 2011
a7d891fbf02c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7035 f3b2605a-c512-4ea7…	Oct 6 2011
6afceab52050	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7033 f3b2605a-c512-4ea7…	Oct 6 2011
223d56efc994	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7032 f3b2605a-c512-4ea7…	Oct 6 2011
2e32772d1da9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7031 f3b2605a-c512-4ea7…	Oct 6 2011
77371a142fc4	athomps	Remove MAX parentheses again	Oct 6 2011
d2990ef08b71	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7029 f3b2605a-c512-4ea7…	Oct 6 2011
dab569f8cc70	athomps	Added brackets around MAX macro.	Oct 5 2011
bf962e01eed6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7027 f3b2605a-c512-4ea7…	Oct 4 2011

Changes (107)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_packages.html
	M			doc/Section_start.html
	M			doc/angle_hybrid.html
	M			doc/angle_hybrid.txt
	M			doc/bond_hybrid.html
	M			doc/bond_hybrid.txt
	M			doc/dihedral_charmm.html
	M			doc/dihedral_class2.html
	M			doc/dihedral_cosine_shift_exp.html
	M			doc/dihedral_harmonic.html
	M			doc/dihedral_helix.html
	M			doc/dihedral_hybrid.html
	M			doc/dihedral_hybrid.txt
	M			doc/dihedral_multi_harmonic.html
	M			doc/dihedral_opls.html
	M			doc/fix_gravity.html
	M			doc/fix_nve_sphere.html
	M			doc/fix_qeq_comb.html
	M			doc/fix_spring.html
	M			doc/fix_spring.txt
	M			doc/improper_hybrid.html
	M			doc/improper_hybrid.txt
	M			doc/pair_adp.html
	M			doc/pair_airebo.html
	M			doc/pair_born.html
	M			doc/pair_buck.html
	M			doc/pair_buck_coul.html
	M			doc/pair_charmm.html
	M			doc/pair_class2.html
	M			doc/pair_colloid.html
	M			doc/pair_comb.html
	M			doc/pair_coul.html
	M			doc/pair_dipole.html
	M			doc/pair_dpd.html
	M			doc/pair_eam.html
	M			doc/pair_edip.html
	M			doc/pair_eim.html
	M			doc/pair_gauss.html
	M			doc/pair_gayberne.html
	M			doc/pair_gran.html
	M			doc/pair_gromacs.html
	M			doc/pair_hbond_dreiding.html
	M			doc/pair_hybrid.html
	M			doc/pair_lj.html
	M			doc/pair_lj96.html
	M			doc/pair_lj_coul.html
	M			doc/pair_lj_cubic.html
	M			doc/pair_lj_expand.html
	M			doc/pair_lj_sf.html
	M			doc/pair_lj_smooth.html
	M			doc/pair_lubricate.html
	M			doc/pair_morse.html
	M			doc/pair_peri.html
	M			doc/pair_reax_c.html
	M			doc/pair_reax_c.txt
	M			doc/pair_resquared.html
	M			doc/pair_soft.html
	M			doc/pair_sw.html
	M			doc/pair_table.html
	M			doc/pair_tersoff.html
	M			doc/pair_tersoff_zbl.html
	M			doc/pair_yukawa.html
	M			doc/pair_yukawa_colloid.html
	M			doc/suffix.html
	M			doc/suffix.txt
	M			src/KSPACE/fft3d.cpp
	M			src/KSPACE/remap.cpp
	M			src/MOLECULE/angle_hybrid.cpp
	M			src/MOLECULE/dihedral_hybrid.cpp
	M			src/MOLECULE/improper_hybrid.cpp
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/USER-REAXC/reaxc_allocate.cpp
	M			src/USER-REAXC/reaxc_basic_comm.cpp
	M			src/USER-REAXC/reaxc_bond_orders.cpp
	M			src/USER-REAXC/reaxc_bond_orders.h
	M			src/USER-REAXC/reaxc_bonds.cpp
	M			src/USER-REAXC/reaxc_control.cpp
	M			src/USER-REAXC/reaxc_defs.h
	M			src/USER-REAXC/reaxc_ffield.cpp
	M			src/USER-REAXC/reaxc_forces.cpp
	M			src/USER-REAXC/reaxc_hydrogen_bonds.cpp
	M			src/USER-REAXC/reaxc_init_md.cpp
	M			src/USER-REAXC/reaxc_io_tools.cpp
	M			src/USER-REAXC/reaxc_list.cpp
	M			src/USER-REAXC/reaxc_lookup.cpp
	M			src/USER-REAXC/reaxc_multi_body.cpp
	M			src/USER-REAXC/reaxc_nonbonded.cpp
	M			src/USER-REAXC/reaxc_reset_tools.cpp
	M			src/USER-REAXC/reaxc_system_props.cpp
	M			src/USER-REAXC/reaxc_tool_box.cpp
	M			src/USER-REAXC/reaxc_torsion_angles.cpp
	M			src/USER-REAXC/reaxc_traj.cpp
	M			src/USER-REAXC/reaxc_types.h
	M			src/USER-REAXC/reaxc_valence_angles.cpp
	M			src/USER-REAXC/reaxc_vector.cpp
	M			src/USER-REAXC/reaxc_vector.h
	M			src/bond_hybrid.cpp
	M			src/compute_pair.cpp
	M			src/force.cpp
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_hybrid.cpp
	M			src/version.h

Merge branch 'master' into openmp-step4a35cb79bc19cActions

Description

Details

Event Timeline

Merged Changes

Changes (107)Show All Changes

Very Large Commit

rLAMMPSa35cb79bc19c

doc/Section_accelerate.html

doc/Section_accelerate.txt

doc/Section_commands.html

doc/Section_commands.txt

doc/Section_packages.html

doc/Section_start.html

doc/angle_hybrid.html

doc/angle_hybrid.txt

doc/bond_hybrid.html

doc/bond_hybrid.txt

doc/dihedral_charmm.html

doc/dihedral_class2.html

doc/dihedral_cosine_shift_exp.html

doc/dihedral_harmonic.html

doc/dihedral_helix.html

doc/dihedral_hybrid.html

doc/dihedral_hybrid.txt

doc/dihedral_multi_harmonic.html

doc/dihedral_opls.html

doc/fix_gravity.html

doc/fix_nve_sphere.html

doc/fix_qeq_comb.html

doc/fix_spring.html

doc/fix_spring.txt

doc/improper_hybrid.html

doc/improper_hybrid.txt

doc/pair_adp.html

doc/pair_airebo.html

doc/pair_born.html

doc/pair_buck.html

doc/pair_buck_coul.html

doc/pair_charmm.html

doc/pair_class2.html

doc/pair_colloid.html

doc/pair_comb.html

doc/pair_coul.html

doc/pair_dipole.html

doc/pair_dpd.html

doc/pair_eam.html

doc/pair_edip.html

doc/pair_eim.html

doc/pair_gauss.html

doc/pair_gayberne.html

doc/pair_gran.html

doc/pair_gromacs.html

doc/pair_hbond_dreiding.html

doc/pair_hybrid.html

doc/pair_lj.html

doc/pair_lj96.html

doc/pair_lj_coul.html

doc/pair_lj_cubic.html

doc/pair_lj_expand.html

doc/pair_lj_sf.html

doc/pair_lj_smooth.html

doc/pair_lubricate.html

doc/pair_morse.html

doc/pair_peri.html

doc/pair_reax_c.html

doc/pair_reax_c.txt

doc/pair_resquared.html

doc/pair_soft.html

doc/pair_sw.html

doc/pair_table.html

doc/pair_tersoff.html

doc/pair_tersoff_zbl.html

doc/pair_yukawa.html

doc/pair_yukawa_colloid.html

doc/suffix.html

doc/suffix.txt

src/KSPACE/fft3d.cpp

src/KSPACE/remap.cpp

src/MOLECULE/angle_hybrid.cpp

Merge branch 'master' into openmp-step4
a35cb79bc19c
Actions

Changes (107)
Show All Changes