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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 14 2016, 15:39.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 14 2016, 15:39

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS206f4e18a64e: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15573 f3b2605a-c512-4ea7…
rLAMMPSa2b4a794d9a2: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS3b4412d782ef: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 14 2016, 15:39

Merged Changes

Commit	Author	Details	Committed
206f4e18a64e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15573 f3b2605a-c512-4ea7…	Sep 14 2016
b3fa20718f0c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15572 f3b2605a-c512-4ea7…	Sep 14 2016
9d0e85392555	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15571 f3b2605a-c512-4ea7…	Sep 14 2016
babaa839b0c2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15570 f3b2605a-c512-4ea7…	Sep 14 2016
9f3118341a30	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15569 f3b2605a-c512-4ea7…	Sep 13 2016
342421babb28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15568 f3b2605a-c512-4ea7…	Sep 13 2016
423052134b98	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15567 f3b2605a-c512-4ea7…	Sep 13 2016
fd5363fb6e38	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15566 f3b2605a-c512-4ea7…	Sep 13 2016

Changes (173)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/html/Manual.html
	M			doc/html/Section_commands.html
	M			doc/html/Section_example.html
	M			doc/html/Section_tools.html
	M			doc/html/atom_modify.html
	M			doc/html/atom_style.html
	M			doc/html/body.html
	M			doc/html/change_box.html
	M			doc/html/comm_modify.html
	M			doc/html/compute_bond_local.html
	M			doc/html/compute_dipole_chunk.html
	M			doc/html/compute_inertia_chunk.html
	M			doc/html/compute_ke_atom_eff.html
	M			doc/html/compute_ke_eff.html
	M			doc/html/compute_modify.html
	M			doc/html/compute_pe_atom.html
	M			doc/html/compute_property_atom.html
	M			doc/html/compute_property_chunk.html
	M			doc/html/compute_reduce.html
	M			doc/html/compute_rigid_local.html
	M			doc/html/compute_temp_cs.html
	M			doc/html/compute_temp_eff.html
	M			doc/html/compute_ti.html
	M			doc/html/compute_voronoi_atom.html
	M			doc/html/delete_bonds.html
	M			doc/html/dihedral_table.html
	M			doc/html/dump.html
	M			doc/html/dump_custom_vtk.html
	M			doc/html/dump_modify.html
	M			doc/html/fix_atom_swap.html
	M			doc/html/fix_ave_atom.html
	M			doc/html/fix_ave_chunk.html
	M			doc/html/fix_ave_correlate_long.html
	M			doc/html/fix_ave_histo.html
	M			doc/html/fix_ave_time.html
	M			doc/html/fix_bond_break.html
	M			doc/html/fix_bond_create.html
	M			doc/html/fix_colvars.html
	M			doc/html/fix_deform.html
	M			doc/html/fix_deposit.html
	M			doc/html/fix_drag.html
	M			doc/html/fix_drude_transform.html
	M			doc/html/fix_efield.html
	M			doc/html/fix_external.html
	M			doc/html/fix_gcmc.html
	M			doc/html/fix_gle.html
	M			doc/html/fix_gravity.html
	M			doc/html/fix_heat.html
	M			doc/html/fix_imd.html
	M			doc/html/fix_ipi.html
	M			doc/html/fix_langevin.html
	M			doc/html/fix_langevin_eff.html
	M			doc/html/fix_lb_momentum.html
	M			doc/html/fix_lb_pc.html
	M			doc/html/fix_lb_rigid_pc_sphere.html
	M			doc/html/fix_lb_viscous.html
	M			doc/html/fix_lineforce.html
	M			doc/html/fix_move.html
	M			doc/html/fix_msst.html
	M			doc/html/fix_neb.html
	M			doc/html/fix_nh_eff.html
	M			doc/html/fix_nph_asphere.html
	M			doc/html/fix_nph_sphere.html
	M			doc/html/fix_npt_asphere.html
	M			doc/html/fix_npt_body.html
	M			doc/html/fix_npt_sphere.html
	M			doc/html/fix_nve_asphere.html
	M			doc/html/fix_nve_asphere_noforce.html
	M			doc/html/fix_nve_body.html
	M			doc/html/fix_nve_line.html
	M			doc/html/fix_nve_manifold_rattle.html
	M			doc/html/fix_nve_sphere.html
	M			doc/html/fix_nve_tri.html
	M			doc/html/fix_nvt_asphere.html
	M			doc/html/fix_nvt_body.html
	M			doc/html/fix_nvt_sllod.html
	M			doc/html/fix_nvt_sllod_eff.html
	M			doc/html/fix_nvt_sphere.html
	M			doc/html/fix_phonon.html
	M			doc/html/fix_pour.html
	M			doc/html/fix_qeq.html
	M			doc/html/fix_qeq_comb.html
	M			doc/html/fix_qeq_reax.html
	M			doc/html/fix_qmmm.html
	M			doc/html/fix_qtb.html
	M			doc/html/fix_reaxc_bonds.html
	M			doc/html/fix_reaxc_species.html
	M			doc/html/fix_saed_vtk.html
	M			doc/html/fix_smd.html
	M			doc/html/fix_smd_adjust_dt.html
	M			doc/html/fix_smd_integrate_tlsph.html
	M			doc/html/fix_smd_integrate_ulsph.html
	M			doc/html/fix_smd_move_triangulated_surface.html
	M			doc/html/fix_smd_setvel.html
	M			doc/html/fix_smd_wall_surface.html
	M			doc/html/fix_spring.html
	M			doc/html/fix_spring_chunk.html
	M			doc/html/fix_spring_self.html
	M			doc/html/fix_store_state.html
	M			doc/html/fix_temp_rescale_eff.html
	M			doc/html/fix_tfmc.html
	M			doc/html/fix_thermal_conductivity.html
	M			doc/html/fix_viscosity.html
	M			doc/html/fix_viscous.html
	M			doc/html/fix_wall_gran.html
	M			doc/html/fix_wall_piston.html
	M			doc/html/fix_wall_reflect.html
	M			doc/html/genindex.html
	M			doc/html/group.html
	M			doc/html/if.html
	M			doc/html/jump.html
	M			doc/html/kspace_modify.html
	M			doc/html/kspace_style.html
	M			doc/html/lattice.html
	M			doc/html/min_modify.html
	M			doc/html/min_style.html
	M			doc/html/next.html
	M			doc/html/package.html
	M			doc/html/pair_brownian.html
	M			doc/html/pair_dsmc.html
	M			doc/html/pair_hybrid.html
	M			doc/html/pair_line_lj.html
	M			doc/html/pair_peri.html
	M			doc/html/pair_quip.html
	M			doc/html/pair_reax.html
	M			doc/html/pair_reax_c.html
	M			doc/html/pair_smd_hertz.html
	M			doc/html/pair_smd_triangulated_surface.html
	M			doc/html/pair_style.html
	M			doc/html/pair_thole.html
	M			doc/html/pair_tri_lj.html
	M			doc/html/pair_vashishta.html
	M			doc/html/prd.html
	M			doc/html/processors.html
	M			doc/html/python.html
	M			doc/html/read_dump.html
	M			doc/html/restart.html
	M			doc/html/run_style.html
	M			doc/html/set.html
	M			doc/html/special_bonds.html
	M			doc/html/tad.html
	M			doc/html/thermo.html
	M			doc/html/thermo_style.html
	M			doc/html/units.html
	M			doc/html/variable.html
	M			doc/html/velocity.html
	M			doc/html/write_coeff.html
	M			doc/src/Manual.txt
	M			doc/src/compute_bond_local.txt
	M			doc/src/pair_vashishta.txt
	P			examples/vashishta/in.indiumphosphide Deleted after being copied to multiple locations: examples/vashishta/in.vashishta.inp examples/vashishta/in.vashishta.table.inp
	P			examples/vashishta/in.sio2 Deleted after being copied to multiple locations: examples/vashishta/in.vashishta.sio2 examples/vashishta/in.vashishta.table.sio2
	P			examples/vashishta/in.vashishta.inp Copied from examples/vashishta/in.indiumphosphide
	P			examples/vashishta/in.vashishta.sio2 Copied from examples/vashishta/in.sio2
	V			examples/vashishta/{in.vashishta.table.inp ← in.indiumphosphide}
	V			examples/vashishta/{in.vashishta.table.sio2 ← in.sio2}
	P			examples/vashishta/log.13Sep16.vashishta.inp.g++.1 Copied from examples/vashishta/log.15Feb16.indiumphosphide.g++.1
	P			examples/vashishta/log.13Sep16.vashishta.inp.g++.4 Copied from examples/vashishta/log.15Feb16.indiumphosphide.g++.1
	P			examples/vashishta/log.13Sep16.vashishta.sio2.g++.1 Copied from examples/vashishta/log.15Feb16.sio2.g++.1
	P			examples/vashishta/log.13Sep16.vashishta.sio2.g++.4 Copied from examples/vashishta/log.15Feb16.sio2.g++.4
	P			examples/vashishta/log.13Sep16.vashishta.table.inp.g++.1 Copied from examples/vashishta/log.15Feb16.indiumphosphide.g++.1
	V			examples/vashishta/{log.13Sep16.vashishta.table.inp.g++.4 ← log.15Feb16.indiumphosphide.g++.1}
	V			examples/vashishta/{log.13Sep16.vashishta.table.sio2.g++.1 ← log.15Feb16.sio2.g++.1}
	V			examples/vashishta/{log.13Sep16.vashishta.table.sio2.g++.4 ← log.15Feb16.sio2.g++.4}
	P			examples/vashishta/log.15Feb16.indiumphosphide.g++.1 Deleted after being copied to multiple locations: examples/vashishta/log.13Sep16.vashishta.inp.g++.1 examples/vashishta/log.13Sep16.vashishta.inp.g++.4 examples/vashishta/log.13Sep16.vashishta.table.inp.g++.1 examples/vashishta/log.13Sep16.vashishta.table.inp.g++.4
	D			examples/vashishta/log.15Feb16.indiumphosphide.g++.4
	P			examples/vashishta/log.15Feb16.sio2.g++.1 Deleted after being copied to multiple locations: examples/vashishta/log.13Sep16.vashishta.sio2.g++.1 examples/vashishta/log.13Sep16.vashishta.table.sio2.g++.1
	P			examples/vashishta/log.15Feb16.sio2.g++.4 Deleted after being copied to multiple locations: examples/vashishta/log.13Sep16.vashishta.sio2.g++.4 examples/vashishta/log.13Sep16.vashishta.table.sio2.g++.4
	M			src/compute_bond_local.cpp
	M			src/compute_bond_local.h
	M			src/dump_local.cpp
	M			src/fix_ave_atom.cpp
	M			src/version.h