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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 22 2015, 13:49.

Description

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

Resolved Conflicts:
doc/Manual.txt
doc/pair_reax.html

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Dec 22 2015, 13:49

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS0fd57a6fe4a8: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14395 f3b2605a-c512-4ea7…
rLAMMPS4a4f7b755439: incorporate support for ziggurat method into RanMT

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS81f9f74d8e53: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 22 2015, 13:49

Merged Changes

	Commit			Author	Details	Committed
	0fd57a6fe4a8			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14395 f3b2605a-c512-4ea7…	Dec 21 2015
	6f10e999c93b			sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14394 f3b2605a-c512-4ea7…	Dec 21 2015

Changes (498)
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_commands.html
	M			doc/Section_errors.html
	M			doc/Section_example.html
	M			doc/Section_history.html
	M			doc/Section_howto.html
	M			doc/Section_intro.html
	M			doc/Section_modify.html
	M			doc/Section_packages.html
	M			doc/Section_perf.html
	M			doc/Section_python.html
	M			doc/Section_start.html
	M			doc/Section_tools.html
	M			doc/accelerate_cuda.html
	M			doc/accelerate_gpu.html
	M			doc/accelerate_intel.html
	M			doc/accelerate_kokkos.html
	M			doc/accelerate_omp.html
	M			doc/accelerate_opt.html
	M			doc/angle_charmm.html
	M			doc/angle_class2.html
	M			doc/angle_coeff.html
	M			doc/angle_cosine.html
	M			doc/angle_cosine_delta.html
	M			doc/angle_cosine_periodic.html
	M			doc/angle_cosine_shift.html
	M			doc/angle_cosine_shift_exp.html
	M			doc/angle_cosine_squared.html
	M			doc/angle_dipole.html
	M			doc/angle_fourier.html
	M			doc/angle_fourier_simple.html
	M			doc/angle_harmonic.html
	M			doc/angle_hybrid.html
	M			doc/angle_none.html
	M			doc/angle_quartic.html
	M			doc/angle_sdk.html
	M			doc/angle_style.html
	M			doc/angle_table.html
	M			doc/atom_modify.html
	M			doc/atom_style.html
	M			doc/balance.html
	M			doc/body.html
	M			doc/bond_class2.html
	M			doc/bond_coeff.html
	M			doc/bond_fene.html
	M			doc/bond_fene_expand.html
	M			doc/bond_harmonic.html
	M			doc/bond_harmonic_shift.html
	M			doc/bond_harmonic_shift_cut.html
	M			doc/bond_hybrid.html
	M			doc/bond_morse.html
	M			doc/bond_none.html
	M			doc/bond_nonlinear.html
	M			doc/bond_quartic.html
	M			doc/bond_style.html
	M			doc/bond_table.html
	M			doc/boundary.html
	M			doc/box.html
	M			doc/change_box.html
	M			doc/clear.html
	M			doc/comm_modify.html
	M			doc/comm_style.html
	M			doc/compute.html
	M			doc/compute_ackland_atom.html
	M			doc/compute_angle_local.html
	M			doc/compute_angmom_chunk.html
	M			doc/compute_basal_atom.html
	M			doc/compute_body_local.html
	M			doc/compute_bond_local.html
	M			doc/compute_centro_atom.html
	M			doc/compute_chunk_atom.html
	M			doc/compute_cluster_atom.html
	M			doc/compute_cna_atom.html
	M			doc/compute_com.html
	M			doc/compute_com_chunk.html
	M			doc/compute_contact_atom.html
	M			doc/compute_coord_atom.html
	M			doc/compute_damage_atom.html
	M			doc/compute_dihedral_local.html
	M			doc/compute_dilatation_atom.html
	M			doc/compute_displace_atom.html
	M			doc/compute_erotate_asphere.html
	M			doc/compute_erotate_rigid.html
	M			doc/compute_erotate_sphere.html
	M			doc/compute_erotate_sphere_atom.html
	M			doc/compute_event_displace.html
	M			doc/compute_fep.html
	M			doc/compute_group_group.html
	M			doc/compute_gyration.html
	M			doc/compute_gyration_chunk.html
	M			doc/compute_heat_flux.html
	M			doc/compute_hexorder_atom.html
	M			doc/compute_improper_local.html
	M			doc/compute_inertia_chunk.html
	M			doc/compute_ke.html
	M			doc/compute_ke_atom.html
	M			doc/compute_ke_atom_eff.html
	M			doc/compute_ke_eff.html
	M			doc/compute_ke_rigid.html
	M			doc/compute_meso_e_atom.html
	M			doc/compute_meso_rho_atom.html
	M			doc/compute_meso_t_atom.html
	M			doc/compute_modify.html
	M			doc/compute_msd.html
	M			doc/compute_msd_chunk.html
	M			doc/compute_msd_nongauss.html
	M			doc/compute_omega_chunk.html
	M			doc/compute_orientorder_atom.html
	M			doc/compute_pair.html
	M			doc/compute_pair_local.html
	M			doc/compute_pe.html
	M			doc/compute_pe_atom.html
	M			doc/compute_plasticity_atom.html
	M			doc/compute_pressure.html
	M			doc/compute_property_atom.html
	M			doc/compute_property_chunk.html
	M			doc/compute_property_local.html
	M			doc/compute_rdf.html
	M			doc/compute_reduce.html
	M			doc/compute_saed.html
	M			doc/compute_slice.html
	M			doc/compute_smd_contact_radius.html
	M			doc/compute_smd_damage.html
	M			doc/compute_smd_hourglass_error.html
	M			doc/compute_smd_internal_energy.html
	M			doc/compute_smd_plastic_strain.html
	M			doc/compute_smd_plastic_strain_rate.html
	M			doc/compute_smd_rho.html
	M			doc/compute_smd_tlsph_defgrad.html
	M			doc/compute_smd_tlsph_dt.html
	M			doc/compute_smd_tlsph_num_neighs.html
	M			doc/compute_smd_tlsph_shape.html
	M			doc/compute_smd_tlsph_strain.html
	M			doc/compute_smd_tlsph_strain_rate.html
	M			doc/compute_smd_tlsph_stress.html
	M			doc/compute_smd_triangle_mesh_vertices.html
	M			doc/compute_smd_ulsph_num_neighs.html
	M			doc/compute_smd_ulsph_strain.html
	M			doc/compute_smd_ulsph_strain_rate.html
	M			doc/compute_smd_ulsph_stress.html
	M			doc/compute_smd_vol.html
	M			doc/compute_sna_atom.html
	M			doc/compute_stress_atom.html
	M			doc/compute_tally.html
	M			doc/compute_temp.html
	M			doc/compute_temp_asphere.html
	M			doc/compute_temp_chunk.html
	M			doc/compute_temp_com.html
	M			doc/compute_temp_cs.html
	M			doc/compute_temp_deform.html
	M			doc/compute_temp_deform_eff.html
	M			doc/compute_temp_drude.html
	M			doc/compute_temp_eff.html
	M			doc/compute_temp_partial.html
	M			doc/compute_temp_profile.html
	M			doc/compute_temp_ramp.html
	M			doc/compute_temp_region.html
	M			doc/compute_temp_region_eff.html
	M			doc/compute_temp_rotate.html
	M			doc/compute_temp_sphere.html
	M			doc/compute_ti.html
	M			doc/compute_torque_chunk.html
	M			doc/compute_vacf.html
	M			doc/compute_vcm_chunk.html
	M			doc/compute_voronoi_atom.html
	M			doc/compute_xrd.html
	M			doc/create_atoms.html
	M			doc/create_bonds.html
	M			doc/create_box.html
	M			doc/delete_atoms.html
	M			doc/delete_bonds.html
	M			doc/dielectric.html
	M			doc/dihedral_charmm.html
	M			doc/dihedral_class2.html
	M			doc/dihedral_coeff.html
	M			doc/dihedral_cosine_shift_exp.html
	M			doc/dihedral_fourier.html
	M			doc/dihedral_harmonic.html
	M			doc/dihedral_helix.html
	M			doc/dihedral_hybrid.html
	M			doc/dihedral_multi_harmonic.html
	M			doc/dihedral_nharmonic.html
	M			doc/dihedral_none.html
	M			doc/dihedral_opls.html
	M			doc/dihedral_quadratic.html
	M			doc/dihedral_style.html
	M			doc/dihedral_table.html
	M			doc/dimension.html
	M			doc/displace_atoms.html
	M			doc/dump.html
	M			doc/dump_h5md.html
	M			doc/dump_image.html
	M			doc/dump_modify.html
	M			doc/dump_molfile.html
	M			doc/echo.html
	M			doc/fix.html
	M			doc/fix_adapt.html
	M			doc/fix_adapt_fep.html
	M			doc/fix_addforce.html
	M			doc/fix_addtorque.html
	M			doc/fix_append_atoms.html
	M			doc/fix_atc.html
	M			doc/fix_atom_swap.html
	M			doc/fix_ave_atom.html
	M			doc/fix_ave_chunk.html
	M			doc/fix_ave_correlate.html
	M			doc/fix_ave_correlate_long.html
	M			doc/fix_ave_histo.html
	M			doc/fix_ave_spatial.html
	M			doc/fix_ave_spatial_sphere.html
	M			doc/fix_ave_time.html
	M			doc/fix_aveforce.html
	M			doc/fix_balance.html
	M			doc/fix_bond_break.html
	M			doc/fix_bond_create.html
	M			doc/fix_bond_swap.html
	M			doc/fix_box_relax.html
	M			doc/fix_colvars.html
	M			doc/fix_deform.html
	M			doc/fix_deposit.html
	M			doc/fix_drag.html
	M			doc/fix_drude.html
	M			doc/fix_drude_transform.html
	M			doc/fix_dt_reset.html
	M			doc/fix_efield.html
	M			doc/fix_enforce2d.html
	M			doc/fix_evaporate.html
	M			doc/fix_external.html
	M			doc/fix_freeze.html
	M			doc/fix_gcmc.html
	M			doc/fix_gld.html
	M			doc/fix_gle.html
	M			doc/fix_gravity.html
	M			doc/fix_heat.html
	M			doc/fix_imd.html
	M			doc/fix_indent.html
	M			doc/fix_ipi.html
	M			doc/fix_langevin.html
	M			doc/fix_langevin_drude.html
	M			doc/fix_langevin_eff.html
	M			doc/fix_lb_fluid.html
	M			doc/fix_lb_momentum.html
	M			doc/fix_lb_pc.html
	M			doc/fix_lb_rigid_pc_sphere.html
	M			doc/fix_lb_viscous.html
	M			doc/fix_lineforce.html
	M			doc/fix_meso.html
	M			doc/fix_meso_stationary.html
	M			doc/fix_modify.html
	M			doc/fix_momentum.html
	M			doc/fix_move.html
	M			doc/fix_msst.html
	M			doc/fix_neb.html
	M			doc/fix_nh.html
	M			doc/fix_nh_eff.html
	M			doc/fix_nph_asphere.html
	M			doc/fix_nph_sphere.html
	M			doc/fix_nphug.html
	M			doc/fix_npt_asphere.html
	M			doc/fix_npt_sphere.html
	M			doc/fix_nve.html
	M			doc/fix_nve_asphere.html
	M			doc/fix_nve_asphere_noforce.html
	M			doc/fix_nve_body.html
	M			doc/fix_nve_eff.html
	M			doc/fix_nve_limit.html
	M			doc/fix_nve_line.html
	M			doc/fix_nve_noforce.html
	M			doc/fix_nve_sphere.html
	M			doc/fix_nve_tri.html
	M			doc/fix_nvt_asphere.html
	M			doc/fix_nvt_sllod.html
	M			doc/fix_nvt_sllod_eff.html
	M			doc/fix_nvt_sphere.html
	M			doc/fix_oneway.html
	M			doc/fix_orient_fcc.html
	M			doc/fix_phonon.html
	M			doc/fix_pimd.html
	M			doc/fix_planeforce.html
	M			doc/fix_poems.html
	M			doc/fix_pour.html
	M			doc/fix_press_berendsen.html
	M			doc/fix_print.html
	M			doc/fix_property_atom.html
	M			doc/fix_qbmsst.html
	M			doc/fix_qeq.html
	M			doc/fix_qeq_comb.html
	M			doc/fix_qeq_reax.html
	M			doc/fix_qmmm.html
	M			doc/fix_qtb.html
	M			doc/fix_reaxc_bonds.html
	M			doc/fix_reaxc_species.html
	M			doc/fix_recenter.html
	M			doc/fix_restrain.html
	M			doc/fix_rigid.html
	M			doc/fix_saed_vtk.html
	M			doc/fix_setforce.html
	M			doc/fix_shake.html
	M			doc/fix_smd.html
	M			doc/fix_smd_adjust_dt.html
	M			doc/fix_smd_integrate_tlsph.html
	M			doc/fix_smd_integrate_ulsph.html
	M			doc/fix_smd_move_triangulated_surface.html
	M			doc/fix_smd_setvel.html
	M			doc/fix_smd_tlsph_reference_configuration.html
	M			doc/fix_smd_wall_surface.html
	M			doc/fix_spring.html
	M			doc/fix_spring_rg.html
	M			doc/fix_spring_self.html
	M			doc/fix_srd.html
	M			doc/fix_store_force.html
	M			doc/fix_store_state.html
	M			doc/fix_temp_berendsen.html
	M			doc/fix_temp_csvr.html
	M			doc/fix_temp_rescale.html
	M			doc/fix_temp_rescale_eff.html
	M			doc/fix_tfmc.html
	M			doc/fix_thermal_conductivity.html
	M			doc/fix_ti_rs.html
	M			doc/fix_ti_spring.html
	M			doc/fix_tmd.html
	M			doc/fix_ttm.html
	M			doc/fix_tune_kspace.html
	M			doc/fix_vector.html
	M			doc/fix_viscosity.html
	M			doc/fix_viscous.html
	M			doc/fix_wall.html
	M			doc/fix_wall_gran.html
	M			doc/fix_wall_piston.html
	M			doc/fix_wall_reflect.html
	M			doc/fix_wall_region.html
	M			doc/fix_wall_srd.html
	M			doc/genindex.html
	M			doc/group.html
	M			doc/group2ndx.html
	M			doc/if.html
	M			doc/improper_class2.html
	M			doc/improper_coeff.html
	M			doc/improper_cossq.html
	M			doc/improper_cvff.html
	M			doc/improper_distance.html
	M			doc/improper_fourier.html
	M			doc/improper_harmonic.html
	M			doc/improper_hybrid.html
	M			doc/improper_none.html
	M			doc/improper_ring.html
	M			doc/improper_style.html
	M			doc/improper_umbrella.html
	M			doc/include.html
	M			doc/info.html
	M			doc/jump.html
	M			doc/kspace_modify.html
	M			doc/kspace_style.html
	M			doc/label.html
	M			doc/lattice.html
	M			doc/log.html
	M			doc/mass.html
	M			doc/min_modify.html
	M			doc/min_style.html
	M			doc/minimize.html
	M			doc/molecule.html
	M			doc/neb.html
	M			doc/neigh_modify.html
	M			doc/neighbor.html
	M			doc/newton.html
	M			doc/next.html
	M			doc/package.html
	M			doc/pair_adp.html
	M			doc/pair_airebo.html
	M			doc/pair_awpmd.html
	M			doc/pair_beck.html
	M			doc/pair_body.html
	M			doc/pair_bop.html
	M			doc/pair_born.html
	M			doc/pair_brownian.html
	M			doc/pair_buck.html
	M			doc/pair_buck_long.html
	M			doc/pair_charmm.html
	M			doc/pair_class2.html
	M			doc/pair_coeff.html
	M			doc/pair_colloid.html
	M			doc/pair_comb.html
	M			doc/pair_coul.html
	M			doc/pair_coul_diel.html
	M			doc/pair_cs.html
	M			doc/pair_dipole.html
	M			doc/pair_dpd.html
	M			doc/pair_dsmc.html
	M			doc/pair_eam.html
	M			doc/pair_edip.html
	M			doc/pair_eff.html
	M			doc/pair_eim.html
	M			doc/pair_gauss.html
	M			doc/pair_gayberne.html
	M			doc/pair_gran.html
	M			doc/pair_gromacs.html
	M			doc/pair_hbond_dreiding.html
	M			doc/pair_hybrid.html
	M			doc/pair_kim.html
	M			doc/pair_lcbop.html
	M			doc/pair_line_lj.html
	M			doc/pair_list.html
	M			doc/pair_lj.html
	M			doc/pair_lj96.html
	M			doc/pair_lj_cubic.html
	M			doc/pair_lj_expand.html
	M			doc/pair_lj_long.html
	M			doc/pair_lj_sf.html
	M			doc/pair_lj_smooth.html
	M			doc/pair_lj_smooth_linear.html
	M			doc/pair_lj_soft.html
	M			doc/pair_lubricate.html
	M			doc/pair_lubricateU.html
	M			doc/pair_mdf.html
	M			doc/pair_meam.html
	M			doc/pair_meam_spline.html
	M			doc/pair_meam_sw_spline.html
	M			doc/pair_mgpt.html
	M			doc/pair_mie.html
	M			doc/pair_modify.html
	M			doc/pair_morse.html
	M			doc/pair_nb3b_harmonic.html
	M			doc/pair_nm.html
	M			doc/pair_none.html
	M			doc/pair_peri.html
	M			doc/pair_polymorphic.html
	M			doc/pair_quip.html
	M			doc/pair_reax_c.html
	M			doc/pair_resquared.html
	M			doc/pair_sdk.html
	M			doc/pair_smd_hertz.html
	M			doc/pair_smd_tlsph.html
	M			doc/pair_smd_triangulated_surface.html
	M			doc/pair_smd_ulsph.html
	M			doc/pair_smtbq.html
	M			doc/pair_snap.html
	M			doc/pair_soft.html
	M			doc/pair_sph_heatconduction.html
	M			doc/pair_sph_idealgas.html
	M			doc/pair_sph_lj.html
	M			doc/pair_sph_rhosum.html
	M			doc/pair_sph_taitwater.html
	M			doc/pair_sph_taitwater_morris.html
	M			doc/pair_srp.html
	M			doc/pair_style.html
	M			doc/pair_sw.html
	M			doc/pair_table.html
	M			doc/pair_tersoff.html
	M			doc/pair_tersoff_mod.html
	M			doc/pair_tersoff_zbl.html
	M			doc/pair_thole.html
	M			doc/pair_tri_lj.html
	M			doc/pair_vashishta.html
	M			doc/pair_write.html
	M			doc/pair_yukawa.html
	M			doc/pair_yukawa_colloid.html
	M			doc/pair_zbl.html
	M			doc/partition.html
	M			doc/prd.html
	M			doc/print.html
	M			doc/processors.html
	M			doc/python.html
	M			doc/quit.html
	M			doc/read_data.html
	M			doc/read_dump.html
	M			doc/read_restart.html
	M			doc/region.html
	M			doc/replicate.html
	M			doc/rerun.html
	M			doc/reset_timestep.html
	M			doc/restart.html
	M			doc/run.html
	M			doc/run_style.html
	M			doc/search.html
	M			doc/set.html
	M			doc/shell.html
	M			doc/special_bonds.html
	M			doc/suffix.html
	M			doc/tad.html
	M			doc/temper.html
	M			doc/thermo.html
	M			doc/thermo_modify.html
	M			doc/thermo_style.html
	M			doc/timer.html
	M			doc/timestep.html
	M			doc/tutorial_drude.html
	M			doc/uncompute.html
	M			doc/undump.html
	M			doc/unfix.html
	M			doc/units.html
	M			doc/variable.html
	M			doc/velocity.html
	M			doc/write_data.html
	M			doc/write_dump.html
	M			doc/write_restart.html
	M			src/read_dump.cpp