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

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

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 15 2016, 13:25

Pushed

junge

Oct 6 2016, 16:49

Parents

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

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
b23e9f0d548e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15579 f3b2605a-c512-4ea7…	Sep 14 2016
b29782d5ab51	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15577 f3b2605a-c512-4ea7…	Sep 14 2016
0f6d21acda7b	sjplimp	sync with Git	Sep 14 2016

Changes (397)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/html/Section_commands.html
	M			doc/html/Section_example.html
	M			doc/html/accelerate_opt.html
	M			doc/html/angle_charmm.html
	M			doc/html/angle_class2.html
	M			doc/html/angle_coeff.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_hybrid.html
	M			doc/html/angle_none.html
	M			doc/html/angle_quartic.html
	M			doc/html/angle_sdk.html
	M			doc/html/angle_style.html
	M			doc/html/angle_table.html
	M			doc/html/angle_zero.html
	M			doc/html/atom_modify.html
	M			doc/html/atom_style.html
	M			doc/html/body.html
	M			doc/html/bond_class2.html
	M			doc/html/bond_coeff.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_hybrid.html
	M			doc/html/bond_morse.html
	M			doc/html/bond_none.html
	M			doc/html/bond_nonlinear.html
	M			doc/html/bond_quartic.html
	M			doc/html/bond_style.html
	M			doc/html/bond_table.html
	M			doc/html/bond_write.html
	M			doc/html/bond_zero.html
	M			doc/html/boundary.html
	M			doc/html/change_box.html
	M			doc/html/comm_style.html
	M			doc/html/compute_angle_local.html
	M			doc/html/compute_angmom_chunk.html
	M			doc/html/compute_body_local.html
	M			doc/html/compute_centro_atom.html
	M			doc/html/compute_chunk_atom.html
	M			doc/html/compute_com_chunk.html
	M			doc/html/compute_coord_atom.html
	M			doc/html/compute_dihedral_local.html
	M			doc/html/compute_dipole_chunk.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_improper_local.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_meso_t_atom.html
	M			doc/html/compute_modify.html
	M			doc/html/compute_msd_chunk.html
	M			doc/html/compute_omega_chunk.html
	M			doc/html/compute_pair_local.html
	M			doc/html/compute_pe.html
	M			doc/html/compute_pe_atom.html
	M			doc/html/compute_pressure.html
	M			doc/html/compute_property_atom.html
	M			doc/html/compute_property_chunk.html
	M			doc/html/compute_rdf.html
	M			doc/html/compute_reduce.html
	M			doc/html/compute_rigid_local.html
	M			doc/html/compute_saed.html
	M			doc/html/compute_slice.html
	M			doc/html/compute_smd_triangle_mesh_vertices.html
	M			doc/html/compute_sna_atom.html
	M			doc/html/compute_stress_atom.html
	M			doc/html/compute_temp.html
	M			doc/html/compute_temp_chunk.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_torque_chunk.html
	M			doc/html/compute_vacf.html
	M			doc/html/compute_vcm_chunk.html
	M			doc/html/compute_voronoi_atom.html
	M			doc/html/compute_xrd.html
	M			doc/html/create_atoms.html
	M			doc/html/create_bonds.html
	M			doc/html/create_box.html
	M			doc/html/delete_atoms.html
	M			doc/html/delete_bonds.html
	M			doc/html/dihedral_charmm.html
	M			doc/html/dihedral_class2.html
	M			doc/html/dihedral_coeff.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_hybrid.html
	M			doc/html/dihedral_multi_harmonic.html
	M			doc/html/dihedral_nharmonic.html
	M			doc/html/dihedral_none.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/dihedral_table.html
	M			doc/html/dihedral_zero.html
	M			doc/html/displace_atoms.html
	M			doc/html/dump.html
	M			doc/html/dump_custom_vtk.html
	M			doc/html/dump_h5md.html
	M			doc/html/dump_modify.html
	M			doc/html/dump_molfile.html
	M			doc/html/fix_adapt.html
	M			doc/html/fix_addforce.html
	M			doc/html/fix_append_atoms.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_aveforce.html
	M			doc/html/fix_balance.html
	M			doc/html/fix_bond_break.html
	M			doc/html/fix_bond_create.html
	M			doc/html/fix_bond_swap.html
	M			doc/html/fix_box_relax.html
	M			doc/html/fix_colvars.html
	M			doc/html/fix_controller.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_dt_reset.html
	M			doc/html/fix_efield.html
	M			doc/html/fix_ehex.html
	M			doc/html/fix_enforce2d.html
	M			doc/html/fix_evaporate.html
	M			doc/html/fix_external.html
	M			doc/html/fix_flow_gauss.html
	M			doc/html/fix_freeze.html
	M			doc/html/fix_gcmc.html
	M			doc/html/fix_gld.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_indent.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_fluid.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_manifoldforce.html
	M			doc/html/fix_meso.html
	M			doc/html/fix_meso_stationary.html
	M			doc/html/fix_modify.html
	M			doc/html/fix_momentum.html
	M			doc/html/fix_move.html
	M			doc/html/fix_msst.html
	M			doc/html/fix_neb.html
	M			doc/html/fix_nh.html
	M			doc/html/fix_nh_eff.html
	M			doc/html/fix_nph_asphere.html
	M			doc/html/fix_nph_body.html
	M			doc/html/fix_nph_sphere.html
	M			doc/html/fix_nphug.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.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_eff.html
	M			doc/html/fix_nve_limit.html
	M			doc/html/fix_nve_line.html
	M			doc/html/fix_nve_manifold_rattle.html
	M			doc/html/fix_nve_noforce.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_manifold_rattle.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_oneway.html
	M			doc/html/fix_orient.html
	M			doc/html/fix_phonon.html
	M			doc/html/fix_pimd.html
	M			doc/html/fix_planeforce.html
	M			doc/html/fix_poems.html
	M			doc/html/fix_pour.html
	M			doc/html/fix_press_berendsen.html
	M			doc/html/fix_print.html
	M			doc/html/fix_property_atom.html
	M			doc/html/fix_qbmsst.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_recenter.html
	M			doc/html/fix_rx.html
	M			doc/html/fix_saed_vtk.html
	M			doc/html/fix_setforce.html
	M			doc/html/fix_shake.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_rg.html
	M			doc/html/fix_spring_self.html
	M			doc/html/fix_srd.html
	M			doc/html/fix_store_force.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_ti_rs.html
	M			doc/html/fix_ti_spring.html
	M			doc/html/fix_tmd.html
	M			doc/html/fix_ttm.html
	M			doc/html/fix_vector.html
	M			doc/html/fix_viscosity.html
	M			doc/html/fix_viscous.html
	M			doc/html/fix_wall.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/fix_wall_region.html
	M			doc/html/fix_wall_srd.html
	M			doc/html/genindex.html
	M			doc/html/group.html
	M			doc/html/if.html
	M			doc/html/improper_class2.html
	M			doc/html/improper_coeff.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_hybrid.html
	M			doc/html/improper_none.html
	M			doc/html/improper_ring.html
	M			doc/html/improper_style.html
	M			doc/html/improper_umbrella.html
	M			doc/html/improper_zero.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/manifolds.html
	M			doc/html/mass.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_adp.html
	M			doc/html/pair_airebo.html
	M			doc/html/pair_awpmd.html
	M			doc/html/pair_beck.html
	M			doc/html/pair_body.html
	M			doc/html/pair_born.html
	M			doc/html/pair_brownian.html
	M			doc/html/pair_buck.html
	M			doc/html/pair_charmm.html
	M			doc/html/pair_class2.html
	M			doc/html/pair_coeff.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_dsmc.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_hybrid.html
	M			doc/html/pair_kim.html
	M			doc/html/pair_lcbop.html
	M			doc/html/pair_line_lj.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_none.html
	M			doc/html/pair_peri.html
	M			doc/html/pair_polymorphic.html
	M			doc/html/pair_quip.html
	M			doc/html/pair_reax.html
	M			doc/html/pair_reax_c.html
	M			doc/html/pair_resquared.html
	M			doc/html/pair_sdk.html
	M			doc/html/pair_smd_hertz.html
	M			doc/html/pair_smd_tlsph.html
	M			doc/html/pair_smd_triangulated_surface.html
	M			doc/html/pair_smd_ulsph.html
	M			doc/html/pair_smtbq.html
	M			doc/html/pair_snap.html
	M			doc/html/pair_soft.html
	M			doc/html/pair_sph_heatconduction.html
	M			doc/html/pair_sph_idealgas.html
	M			doc/html/pair_sph_lj.html
	M			doc/html/pair_sph_rhosum.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_style.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_thole.html
	M			doc/html/pair_tri_lj.html
	M			doc/html/pair_write.html
	M			doc/html/pair_yukawa.html
	M			doc/html/pair_yukawa_colloid.html
	M			doc/html/pair_zbl.html
	M			doc/html/pair_zero.html
	M			doc/html/partition.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/read_restart.html
	M			doc/html/reset_timestep.html
	M			doc/html/restart.html
	M			doc/html/run_style.html
	M			doc/html/set.html
	M			doc/html/shell.html
	M			doc/html/special_bonds.html
	M			doc/html/tad.html
	M			doc/html/thermo.html
	M			doc/html/thermo_modify.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/html/write_data.html
	M			doc/html/write_restart.html
	M			doc/src/boundary.txt
	M			doc/src/fix_adapt.txt
	M			doc/src/pair_dipole.txt
	M			doc/src/variable.txt
	M			src/MEAM/pair_meam.cpp
	M			src/USER-COLVARS/fix_colvars.cpp
	M			src/USER-COLVARS/fix_colvars.h
	M			src/comm_brick.cpp
	M			src/comm_tiled.cpp
	M			src/info.cpp
	M			src/info.h