Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
fe49cbe4cc1f
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 11 2016, 12:27.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 11 2016, 12:27

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSa8d7ca367de4: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15564 f3b2605a-c512-4ea7…
rLAMMPS2b53f8039216: require an atom map for compute voronoi/atom occupation

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSfe49cbe4cc1f: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 11 2016, 12:27

Merged Changes

	Commit			Author	Details	Committed
	a8d7ca367de4			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15564 f3b2605a-c512-4ea7…	Sep 10 2016
	99d5bf89bcdc			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15563 f3b2605a-c512-4ea7…	Sep 10 2016

Changes (146)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/html/Section_tools.html
	M			doc/html/angle_charmm.html
	M			doc/html/angle_class2.html
	M			doc/html/angle_cosine.html
	M			doc/html/angle_cosine_delta.html
	M			doc/html/angle_cosine_periodic.html
	M			doc/html/angle_cosine_shift.html
	M			doc/html/angle_cosine_shift_exp.html
	M			doc/html/angle_cosine_squared.html
	M			doc/html/angle_dipole.html
	M			doc/html/angle_fourier.html
	M			doc/html/angle_fourier_simple.html
	M			doc/html/angle_harmonic.html
	M			doc/html/angle_quartic.html
	M			doc/html/angle_sdk.html
	M			doc/html/bond_class2.html
	M			doc/html/bond_fene.html
	M			doc/html/bond_fene_expand.html
	M			doc/html/bond_harmonic.html
	M			doc/html/bond_harmonic_shift.html
	M			doc/html/bond_harmonic_shift_cut.html
	M			doc/html/bond_morse.html
	M			doc/html/bond_nonlinear.html
	M			doc/html/bond_quartic.html
	M			doc/html/compute_centro_atom.html
	M			doc/html/compute_fep.html
	M			doc/html/compute_gyration_chunk.html
	M			doc/html/compute_heat_flux.html
	M			doc/html/compute_pressure.html
	M			doc/html/compute_saed.html
	M			doc/html/compute_sna_atom.html
	M			doc/html/compute_stress_atom.html
	M			doc/html/compute_xrd.html
	M			doc/html/create_atoms.html
	M			doc/html/dihedral_charmm.html
	M			doc/html/dihedral_class2.html
	M			doc/html/dihedral_cosine_shift_exp.html
	M			doc/html/dihedral_fourier.html
	M			doc/html/dihedral_helix.html
	M			doc/html/dihedral_multi_harmonic.html
	M			doc/html/dihedral_nharmonic.html
	M			doc/html/dihedral_opls.html
	M			doc/html/dihedral_quadratic.html
	M			doc/html/dihedral_spherical.html
	M			doc/html/dihedral_style.html
	M			doc/html/fix_balance.html
	M			doc/html/fix_bond_swap.html
	M			doc/html/fix_box_relax.html
	M			doc/html/fix_controller.html
	M			doc/html/fix_ehex.html
	M			doc/html/fix_gld.html
	M			doc/html/fix_lb_fluid.html
	M			doc/html/fix_nh.html
	M			doc/html/fix_nphug.html
	M			doc/html/fix_orient.html
	M			doc/html/fix_pimd.html
	M			doc/html/fix_qbmsst.html
	M			doc/html/fix_restrain.html
	M			doc/html/fix_rx.html
	M			doc/html/fix_shake.html
	M			doc/html/fix_spring_rg.html
	M			doc/html/fix_ti_rs.html
	M			doc/html/fix_ti_spring.html
	M			doc/html/fix_ttm.html
	M			doc/html/fix_wall.html
	M			doc/html/fix_wall_region.html
	M			doc/html/genindex.html
	M			doc/html/improper_class2.html
	M			doc/html/improper_cossq.html
	M			doc/html/improper_cvff.html
	M			doc/html/improper_distance.html
	M			doc/html/improper_fourier.html
	M			doc/html/improper_harmonic.html
	M			doc/html/improper_ring.html
	M			doc/html/improper_umbrella.html
	M			doc/html/pair_adp.html
	M			doc/html/pair_airebo.html
	M			doc/html/pair_beck.html
	M			doc/html/pair_body.html
	M			doc/html/pair_born.html
	M			doc/html/pair_buck.html
	M			doc/html/pair_charmm.html
	M			doc/html/pair_class2.html
	M			doc/html/pair_colloid.html
	M			doc/html/pair_comb.html
	M			doc/html/pair_coul.html
	M			doc/html/pair_coul_diel.html
	M			doc/html/pair_cs.html
	M			doc/html/pair_dipole.html
	M			doc/html/pair_dpd.html
	M			doc/html/pair_dpd_fdt.html
	M			doc/html/pair_eam.html
	M			doc/html/pair_edip.html
	M			doc/html/pair_eff.html
	M			doc/html/pair_eim.html
	M			doc/html/pair_exp6_rx.html
	M			doc/html/pair_gauss.html
	M			doc/html/pair_gayberne.html
	M			doc/html/pair_gromacs.html
	M			doc/html/pair_hbond_dreiding.html
	M			doc/html/pair_list.html
	M			doc/html/pair_lj.html
	M			doc/html/pair_lj96.html
	M			doc/html/pair_lj_cubic.html
	M			doc/html/pair_lj_expand.html
	M			doc/html/pair_lj_long.html
	M			doc/html/pair_lj_sf.html
	M			doc/html/pair_lj_smooth.html
	M			doc/html/pair_lj_smooth_linear.html
	M			doc/html/pair_lj_soft.html
	M			doc/html/pair_lubricate.html
	M			doc/html/pair_lubricateU.html
	M			doc/html/pair_mdf.html
	M			doc/html/pair_meam.html
	M			doc/html/pair_meam_spline.html
	M			doc/html/pair_meam_sw_spline.html
	M			doc/html/pair_mgpt.html
	M			doc/html/pair_mie.html
	M			doc/html/pair_morse.html
	M			doc/html/pair_multi_lucy.html
	M			doc/html/pair_multi_lucy_rx.html
	M			doc/html/pair_nb3b_harmonic.html
	M			doc/html/pair_nm.html
	M			doc/html/pair_polymorphic.html
	M			doc/html/pair_resquared.html
	M			doc/html/pair_sdk.html
	M			doc/html/pair_smtbq.html
	M			doc/html/pair_snap.html
	M			doc/html/pair_soft.html
	M			doc/html/pair_sph_idealgas.html
	M			doc/html/pair_sph_taitwater.html
	M			doc/html/pair_sph_taitwater_morris.html
	M			doc/html/pair_srp.html
	M			doc/html/pair_sw.html
	M			doc/html/pair_tersoff.html
	M			doc/html/pair_tersoff_mod.html
	M			doc/html/pair_tersoff_zbl.html
	M			doc/html/pair_vashishta.html
	M			doc/html/pair_yukawa.html
	M			doc/html/pair_yukawa_colloid.html
	M			doc/html/pair_zbl.html
	M			doc/src/fix_restrain.txt
	M			src/MISC/fix_ttm.cpp
	M			src/compute_angle_local.cpp
	M			src/compute_bond_local.cpp
	M			src/math_extra.h