Merge branch 'master' into openmp-master
93686ca6ab75
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 14 2011, 18:30.

Description

Merge branch 'master' into openmp-master

Resolved Conflicts:
doc/processors.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Dec 14 2011, 18:30

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSd2bd36e1ef76: bugfix for bugfix
rLAMMPSad9fa0e18743: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7361 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS93686ca6ab75: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 14 2011, 18:30

Merged Changes

Commit	Author	Details	Committed
ad9fa0e18743	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7361 f3b2605a-c512-4ea7…	Dec 13 2011
8068e88f0ca4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7360 f3b2605a-c512-4ea7…	Dec 13 2011
28b1e0de2bad	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7359 f3b2605a-c512-4ea7…	Dec 13 2011
25ea036d7df5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7358 f3b2605a-c512-4ea7…	Dec 13 2011
62e304c0d325	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7357 f3b2605a-c512-4ea7…	Dec 13 2011
7e6755866f77	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7356 f3b2605a-c512-4ea7…	Dec 13 2011
37ed3d917e88	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7355 f3b2605a-c512-4ea7…	Dec 13 2011
ae6318ce2955	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7354 f3b2605a-c512-4ea7…	Dec 13 2011
b294de40f9f7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7353 f3b2605a-c512-4ea7…	Dec 13 2011
eb04caa0548a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7351 f3b2605a-c512-4ea7…	Dec 13 2011
3870fcb2917a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7350 f3b2605a-c512-4ea7…	Dec 13 2011
eeb5ad77e617	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7348 f3b2605a-c512-4ea7…	Dec 13 2011
2f7c6cfb0deb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7347 f3b2605a-c512-4ea7…	Dec 13 2011
47c30ce47cbf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7346 f3b2605a-c512-4ea7…	Dec 13 2011
a866ec3edbd8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7345 f3b2605a-c512-4ea7…	Dec 13 2011
dfdc3fe1a2d4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7344 f3b2605a-c512-4ea7…	Dec 13 2011
3d36d38a5183	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7343 f3b2605a-c512-4ea7…	Dec 13 2011
9b72a103ea29	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7342 f3b2605a-c512-4ea7…	Dec 13 2011
8325ae695402	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7341 f3b2605a-c512-4ea7…	Dec 13 2011
86347b81e32f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7340 f3b2605a-c512-4ea7…	Dec 13 2011
744efbc2cd5d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7339 f3b2605a-c512-4ea7…	Dec 13 2011

Changes (434)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Eqs/angle_charmm.jpg
	M			doc/Eqs/angle_class2.jpg
	M			doc/Eqs/angle_cosine.jpg
	M			doc/Eqs/angle_cosine_delta.jpg
	M			doc/Eqs/angle_cosine_periodic.jpg
	M			doc/Eqs/angle_cosine_shift.jpg
	M			doc/Eqs/angle_cosine_shift_exp.jpg
	M			doc/Eqs/angle_cosine_squared.jpg
	M			doc/Eqs/angle_harmonic.jpg
	M			doc/Eqs/bond_class2.jpg
	M			doc/Eqs/bond_fene.jpg
	M			doc/Eqs/bond_fene_expand.jpg
	M			doc/Eqs/bond_harmonic.jpg
	M			doc/Eqs/bond_harmonic_shift.jpg
	M			doc/Eqs/bond_harmonic_shift_cut.jpg
	M			doc/Eqs/bond_morse.jpg
	M			doc/Eqs/bond_nonlinear.jpg
	M			doc/Eqs/bond_quartic.jpg
	M			doc/Eqs/box.jpg
	M			doc/Eqs/box_inverse.jpg
	M			doc/Eqs/centro_symmetry.jpg
	M			doc/Eqs/cna_cutoff1.jpg
	M			doc/Eqs/cna_cutoff2.jpg
	M			doc/Eqs/compute_gyration.jpg
	M			doc/Eqs/dihedral_charmm.jpg
	M			doc/Eqs/dihedral_class2.jpg
	M			doc/Eqs/dihedral_cosine_shift_exp.jpg
	M			doc/Eqs/dihedral_harmonic.jpg
	M			doc/Eqs/dihedral_helix.jpg
	M			doc/Eqs/dihedral_multi_harmonic.jpg
	M			doc/Eqs/dihedral_opls.jpg
	M			doc/Eqs/eff_KE.jpg
	M			doc/Eqs/eff_NN.jpg
	M			doc/Eqs/eff_Ne.jpg
	M			doc/Eqs/eff_Pauli.jpg
	M			doc/Eqs/eff_ee.jpg
	M			doc/Eqs/eff_energy_expression.jpg
	M			doc/Eqs/fix_box_relax1.jpg
	M			doc/Eqs/fix_box_relax2.jpg
	D			doc/Eqs/fix_gyration.jpg
	D			doc/Eqs/fix_gyration.tex
	M			doc/Eqs/fix_nh1.jpg
	M			doc/Eqs/fix_nphug.jpg
	M			doc/Eqs/fix_orient_fcc.jpg
	M			doc/Eqs/fix_spring_rg.jpg
	M			doc/Eqs/fix_ttm.jpg
	M			doc/Eqs/fix_wall_colloid.jpg
	M			doc/Eqs/fix_wall_harmonic.jpg
	M			doc/Eqs/fix_wall_lj93.jpg
	M			doc/Eqs/fld.jpg
	M			doc/Eqs/fld2.jpg
	M			doc/Eqs/heat_flux_J.jpg
	M			doc/Eqs/heat_flux_k.jpg
	M			doc/Eqs/improper_class2.jpg
	M			doc/Eqs/improper_cvff.jpg
	M			doc/Eqs/improper_harmonic.jpg
	M			doc/Eqs/improper_umbrella.jpg
	M			doc/Eqs/min_energy.jpg
	M			doc/Eqs/pair_adp.jpg
	M			doc/Eqs/pair_airebo.jpg
	M			doc/Eqs/pair_born.jpg
	M			doc/Eqs/pair_buck.jpg
	M			doc/Eqs/pair_charmm.jpg
	M			doc/Eqs/pair_class2.jpg
	M			doc/Eqs/pair_cmm.jpg
	M			doc/Eqs/pair_colloid_cc.jpg
	M			doc/Eqs/pair_colloid_cs.jpg
	M			doc/Eqs/pair_colloid_ss.jpg
	M			doc/Eqs/pair_comb1.jpg
	M			doc/Eqs/pair_comb2.jpg
	M			doc/Eqs/pair_coul_diel.jpg
	A			doc/Eqs/pair_coul_wolf.jpg
	A			doc/Eqs/pair_coul_wolf.tex
	M			doc/Eqs/pair_coulomb.jpg
	M			doc/Eqs/pair_debye.jpg
	M			doc/Eqs/pair_dipole.jpg
	M			doc/Eqs/pair_dipole_sf.jpg
	M			doc/Eqs/pair_dipole_sf2.jpg
	M			doc/Eqs/pair_dpd.jpg
	M			doc/Eqs/pair_eam.jpg
	M			doc/Eqs/pair_eam_fs.jpg
	M			doc/Eqs/pair_edip.jpg
	M			doc/Eqs/pair_eim1.jpg
	M			doc/Eqs/pair_eim2.jpg
	M			doc/Eqs/pair_eim3.jpg
	M			doc/Eqs/pair_gauss.jpg
	M			doc/Eqs/pair_gauss_cut.jpg
	M			doc/Eqs/pair_gayberne.jpg
	M			doc/Eqs/pair_gayberne2.jpg
	V			doc/{Eqs → PDF}/pair_gayberne_extra.tex
	M			doc/Eqs/pair_gran_hertz.jpg
	M			doc/Eqs/pair_gran_hooke.jpg
	M			doc/Eqs/pair_gromacs.jpg
	M			doc/Eqs/pair_hbond_dreiding.jpg
	M			doc/Eqs/pair_lj.jpg
	M			doc/Eqs/pair_lj96.jpg
	M			doc/Eqs/pair_lj_cubic.jpg
	M			doc/Eqs/pair_lj_expand.jpg
	M			doc/Eqs/pair_lj_sf.jpg
	M			doc/Eqs/pair_lj_smooth.jpg
	M			doc/Eqs/pair_lubricate.jpg
	M			doc/Eqs/pair_meam.jpg
	M			doc/Eqs/pair_morse.jpg
	M			doc/Eqs/pair_resquared.jpg
	M			doc/Eqs/pair_resquared2.jpg
	M			doc/Eqs/pair_resquared3.jpg
	M			doc/Eqs/pair_resquared4.jpg
	V			doc/{Eqs → PDF}/pair_resquared_extra.tex
	M			doc/Eqs/pair_soft.jpg
	M			doc/Eqs/pair_sph_ideal.jpg
	M			doc/Eqs/pair_sph_tait.jpg
	M			doc/Eqs/pair_sw.jpg
	M			doc/Eqs/pair_tersoff_1.jpg
	M			doc/Eqs/pair_tersoff_2.jpg
	M			doc/Eqs/pair_tersoff_zbl.jpg
	M			doc/Eqs/pair_yukawa.jpg
	M			doc/Eqs/pair_yukawa_colloid.jpg
	M			doc/Eqs/pressure.jpg
	M			doc/Eqs/pressure_tensor.jpg
	M			doc/Eqs/stress_tensor.jpg
	M			doc/PDF/pair_gayberne_extra.pdf
	V			doc/{PDF ← Eqs}/pair_gayberne_extra.tex
	M			doc/PDF/pair_resquared_extra.pdf
	V			doc/{PDF ← Eqs}/pair_resquared_extra.tex
	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_intro.html
	M			doc/Section_intro.txt
	M			doc/Section_packages.html
	M			doc/Section_packages.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_ackland_atom.html
	M			doc/compute_ackland_atom.txt
	M			doc/compute_centro_atom.html
	M			doc/compute_centro_atom.txt
	M			doc/compute_cluster_atom.html
	M			doc/compute_cluster_atom.txt
	M			doc/compute_cna_atom.html
	M			doc/compute_cna_atom.txt
	M			doc/compute_com_molecule.html
	M			doc/compute_com_molecule.txt
	M			doc/compute_coord_atom.html
	M			doc/compute_coord_atom.txt
	M			doc/compute_damage_atom.html
	M			doc/compute_damage_atom.txt
	M			doc/compute_displace_atom.html
	M			doc/compute_displace_atom.txt
	M			doc/compute_erotate_asphere.html
	M			doc/compute_erotate_asphere.txt
	M			doc/compute_erotate_sphere.html
	M			doc/compute_erotate_sphere.txt
	M			doc/compute_event_displace.html
	M			doc/compute_event_displace.txt
	M			doc/compute_gyration.html
	M			doc/compute_gyration.txt
	M			doc/compute_ke.html
	M			doc/compute_ke.txt
	M			doc/compute_ke_atom.html
	M			doc/compute_ke_atom.txt
	M			doc/compute_ke_atom_eff.html
	M			doc/compute_ke_atom_eff.txt
	M			doc/compute_ke_eff.html
	M			doc/compute_ke_eff.txt
	M			doc/compute_meso_e_atom.html
	M			doc/compute_meso_e_atom.txt
	M			doc/compute_meso_rho_atom.html
	M			doc/compute_meso_rho_atom.txt
	M			doc/compute_meso_t_atom.html
	M			doc/compute_meso_t_atom.txt
	M			doc/compute_pe.html
	M			doc/compute_pe.txt
	M			doc/compute_pe_atom.html
	M			doc/compute_pe_atom.txt
	M			doc/compute_pressure.html
	M			doc/compute_pressure.txt
	M			doc/compute_rdf.html
	M			doc/compute_rdf.txt
	M			doc/compute_reduce.html
	M			doc/compute_reduce.txt
	M			doc/compute_stress_atom.html
	M			doc/compute_stress_atom.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/compute_ti.html
	M			doc/compute_ti.txt
	M			doc/create_box.html
	M			doc/create_box.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/dimension.html
	M			doc/dimension.txt
	M			doc/dump.html
	M			doc/dump.txt
	M			doc/dump_image.html
	M			doc/dump_image.txt
	M			doc/fix_addforce.html
	M			doc/fix_addforce.txt
	M			doc/fix_append_atoms.html
	M			doc/fix_append_atoms.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_meso.html
	M			doc/fix_meso.txt
	M			doc/fix_meso_stationary.html
	M			doc/fix_meso_stationary.txt
	M			doc/fix_neb.html
	M			doc/fix_neb.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_viscosity.html
	M			doc/fix_viscosity.txt
	M			doc/fix_viscous.html
	M			doc/fix_viscous.txt
	M			doc/fix_wall_piston.html
	M			doc/fix_wall_piston.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/kspace_style.html
	M			doc/kspace_style.txt
	M			doc/log.html
	M			doc/log.txt
	M			doc/neb.html
	M			doc/neb.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_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_coeff.html
	M			doc/pair_coeff.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_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_style.html
	M			doc/pair_style.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/read_data.html
	M			doc/read_data.txt
	M			doc/region.html
	M			doc/region.txt
	M			doc/run_style.html
	M			doc/run_style.txt
	M			doc/tad.html
	M			doc/tad.txt
	M			doc/temper.html
	M			doc/temper.txt
	M			doc/thermo_style.html
	M			doc/thermo_style.txt
	M			src/comm.cpp
	M			src/comm.h
	M			src/error.cpp
	P			src/error.h Copied to src/pair_coul_wolf.h
	M			src/lammps.cpp
	A			src/pair_born_coul_wolf.cpp
	A			src/pair_born_coul_wolf.h
	A			src/pair_coul_wolf.cpp
	P			src/pair_coul_wolf.h Copied from src/error.h
	M			src/pair_lj_cut.cpp
	A			src/procmap.cpp
	A			src/procmap.h
	M			src/universe.cpp
	M			src/universe.h
	M			src/variable.cpp
	M			src/version.h