Merge branch 'master' into lammps-icms
a67faf3614f0
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 28 2012, 17:22.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Section_commands.html
doc/processors.html
doc/processors.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 28 2012, 17:22

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS8083ac3cdc19: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7604 f3b2605a-c512-4ea7…
rLAMMPSba7cbebdb5b1: thermo output update. add benchmark script.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa67faf3614f0: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 28 2012, 17:22

Merged Changes

Commit	Author	Details	Committed
8083ac3cdc19	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7604 f3b2605a-c512-4ea7…	Jan 28 2012
14a7cf18833f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7602 f3b2605a-c512-4ea7…	Jan 28 2012
c07292f8e6a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7601 f3b2605a-c512-4ea7…	Jan 28 2012
2edec73dbe50	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7600 f3b2605a-c512-4ea7…	Jan 28 2012
0de08d463e81	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7598 f3b2605a-c512-4ea7…	Jan 28 2012
443b754c6940	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7597 f3b2605a-c512-4ea7…	Jan 28 2012
04044a5f79f8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7596 f3b2605a-c512-4ea7…	Jan 28 2012
0ddb9dee57bf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7594 f3b2605a-c512-4ea7…	Jan 28 2012
6234087ef823	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7593 f3b2605a-c512-4ea7…	Jan 28 2012
10eb4cb68d21	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7592 f3b2605a-c512-4ea7…	Jan 28 2012
7ec706e7e2e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7591 f3b2605a-c512-4ea7…	Jan 27 2012

Changes (239)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/Section_python.html
	M			doc/Section_python.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/angle_charmm.html
	M			doc/angle_charmm.txt
	M			doc/angle_class2.html
	M			doc/angle_class2.txt
	M			doc/angle_cosine.html
	M			doc/angle_cosine.txt
	M			doc/angle_cosine_delta.html
	M			doc/angle_cosine_delta.txt
	M			doc/angle_cosine_periodic.html
	M			doc/angle_cosine_periodic.txt
	M			doc/angle_cosine_shift.html
	M			doc/angle_cosine_shift.txt
	M			doc/angle_cosine_shift_exp.html
	M			doc/angle_cosine_shift_exp.txt
	M			doc/angle_cosine_squared.html
	M			doc/angle_cosine_squared.txt
	M			doc/angle_harmonic.html
	M			doc/angle_harmonic.txt
	M			doc/angle_table.html
	M			doc/angle_table.txt
	M			doc/bond_class2.html
	M			doc/bond_class2.txt
	M			doc/bond_fene.html
	M			doc/bond_fene.txt
	M			doc/bond_fene_expand.html
	M			doc/bond_fene_expand.txt
	M			doc/bond_harmonic.html
	M			doc/bond_harmonic.txt
	M			doc/bond_harmonic_shift.html
	M			doc/bond_harmonic_shift.txt
	M			doc/bond_harmonic_shift_cut.html
	M			doc/bond_harmonic_shift_cut.txt
	M			doc/bond_morse.html
	M			doc/bond_morse.txt
	M			doc/bond_nonlinear.html
	M			doc/bond_nonlinear.txt
	M			doc/bond_quartic.html
	M			doc/bond_quartic.txt
	M			doc/bond_table.html
	M			doc/bond_table.txt
	M			doc/compute_pe.html
	M			doc/compute_pe.txt
	M			doc/compute_pressure.html
	M			doc/compute_pressure.txt
	M			doc/compute_temp.html
	M			doc/compute_temp.txt
	M			doc/compute_temp_partial.html
	M			doc/compute_temp_partial.txt
	M			doc/dihedral_charmm.html
	M			doc/dihedral_charmm.txt
	M			doc/dihedral_class2.html
	M			doc/dihedral_class2.txt
	M			doc/dihedral_cosine_shift_exp.html
	M			doc/dihedral_cosine_shift_exp.txt
	M			doc/dihedral_harmonic.html
	M			doc/dihedral_harmonic.txt
	M			doc/dihedral_helix.html
	M			doc/dihedral_helix.txt
	M			doc/dihedral_multi_harmonic.html
	M			doc/dihedral_multi_harmonic.txt
	M			doc/dihedral_opls.html
	M			doc/dihedral_opls.txt
	M			doc/echo.html
	M			doc/echo.txt
	M			doc/fix_addforce.html
	M			doc/fix_addforce.txt
	M			doc/fix_aveforce.html
	M			doc/fix_aveforce.txt
	M			doc/fix_enforce2d.html
	M			doc/fix_enforce2d.txt
	M			doc/fix_freeze.html
	M			doc/fix_freeze.txt
	M			doc/fix_gravity.html
	M			doc/fix_gravity.txt
	M			doc/fix_nh.html
	M			doc/fix_nh.txt
	M			doc/fix_nve.html
	M			doc/fix_nve.txt
	M			doc/fix_nve_sphere.html
	M			doc/fix_nve_sphere.txt
	M			doc/fix_qeq_comb.html
	M			doc/fix_qeq_comb.txt
	M			doc/fix_setforce.html
	M			doc/fix_setforce.txt
	M			doc/fix_shake.html
	M			doc/fix_shake.txt
	M			doc/fix_temp_berendsen.html
	M			doc/fix_temp_berendsen.txt
	M			doc/fix_temp_rescale.html
	M			doc/fix_temp_rescale.txt
	M			doc/fix_viscous.html
	M			doc/fix_viscous.txt
	M			doc/if.html
	M			doc/if.txt
	M			doc/improper_class2.html
	M			doc/improper_class2.txt
	M			doc/improper_cvff.html
	M			doc/improper_cvff.txt
	M			doc/improper_harmonic.html
	M			doc/improper_harmonic.txt
	M			doc/improper_umbrella.html
	M			doc/improper_umbrella.txt
	M			doc/jump.html
	M			doc/jump.txt
	M			doc/log.html
	M			doc/log.txt
	M			doc/neb.html
	M			doc/neb.txt
	M			doc/neighbor.html
	M			doc/neighbor.txt
	M			doc/next.html
	M			doc/next.txt
	M			doc/package.html
	M			doc/package.txt
	M			doc/pair_adp.html
	M			doc/pair_adp.txt
	M			doc/pair_airebo.html
	M			doc/pair_airebo.txt
	M			doc/pair_born.html
	M			doc/pair_born.txt
	M			doc/pair_brownian.html
	M			doc/pair_brownian.txt
	M			doc/pair_buck.html
	M			doc/pair_buck.txt
	M			doc/pair_buck_coul.html
	M			doc/pair_buck_coul.txt
	M			doc/pair_charmm.html
	M			doc/pair_charmm.txt
	M			doc/pair_class2.html
	M			doc/pair_class2.txt
	M			doc/pair_colloid.html
	M			doc/pair_colloid.txt
	M			doc/pair_comb.html
	M			doc/pair_comb.txt
	M			doc/pair_coul.html
	M			doc/pair_coul.txt
	M			doc/pair_dipole.html
	M			doc/pair_dipole.txt
	M			doc/pair_dpd.html
	M			doc/pair_dpd.txt
	M			doc/pair_eam.html
	M			doc/pair_eam.txt
	M			doc/pair_edip.html
	M			doc/pair_edip.txt
	M			doc/pair_eim.html
	M			doc/pair_eim.txt
	M			doc/pair_gauss.html
	M			doc/pair_gauss.txt
	M			doc/pair_gayberne.html
	M			doc/pair_gayberne.txt
	M			doc/pair_gran.html
	M			doc/pair_gran.txt
	M			doc/pair_gromacs.html
	M			doc/pair_gromacs.txt
	M			doc/pair_hbond_dreiding.html
	M			doc/pair_hbond_dreiding.txt
	M			doc/pair_hybrid.html
	M			doc/pair_hybrid.txt
	M			doc/pair_line_lj.html
	M			doc/pair_line_lj.txt
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	M			doc/pair_lj96.html
	M			doc/pair_lj96.txt
	M			doc/pair_lj_coul.html
	M			doc/pair_lj_coul.txt
	M			doc/pair_lj_cubic.html
	M			doc/pair_lj_cubic.txt
	M			doc/pair_lj_expand.html
	M			doc/pair_lj_expand.txt
	M			doc/pair_lj_sf.html
	M			doc/pair_lj_sf.txt
	M			doc/pair_lj_smooth.html
	M			doc/pair_lj_smooth.txt
	M			doc/pair_lj_smooth_linear.html
	M			doc/pair_lj_smooth_linear.txt
	M			doc/pair_lubricate.html
	M			doc/pair_lubricate.txt
	M			doc/pair_morse.html
	M			doc/pair_morse.txt
	M			doc/pair_peri.html
	M			doc/pair_peri.txt
	M			doc/pair_resquared.html
	M			doc/pair_resquared.txt
	M			doc/pair_sdk.html
	M			doc/pair_sdk.txt
	M			doc/pair_soft.html
	M			doc/pair_soft.txt
	M			doc/pair_sw.html
	M			doc/pair_sw.txt
	M			doc/pair_table.html
	M			doc/pair_table.txt
	M			doc/pair_tersoff.html
	M			doc/pair_tersoff.txt
	M			doc/pair_tersoff_zbl.html
	M			doc/pair_tersoff_zbl.txt
	M			doc/pair_tri_lj.html
	M			doc/pair_tri_lj.txt
	M			doc/pair_yukawa.html
	M			doc/pair_yukawa.txt
	M			doc/pair_yukawa_colloid.html
	M			doc/pair_yukawa_colloid.txt
	M			doc/partition.html
	M			doc/partition.txt
	M			doc/prd.html
	M			doc/prd.txt
	M			doc/processors.html
	M			doc/processors.txt
	M			doc/run_style.html
	M			doc/run_style.txt
	M			doc/suffix.html
	M			doc/suffix.txt
	M			doc/temper.html
	M			doc/temper.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			examples/comb/README
	A			examples/comb/data.CuaS
	A			examples/comb/log.comb.CuaS.9Jan12.linux.1
	A			examples/comb/log.comb.CuaS.9Jan12.linux.4
	M			src/GPU/Install.sh
	A			src/Make.py
	M			src/error.cpp
	M			src/input.cpp
	M			src/input.h
	M			src/lammps.cpp
	M			src/version.h