From 2f298951cff2c6706cdf17815e2a8bac63d7e28d Mon Sep 17 00:00:00 2001 From: Steve Plimpton Date: Wed, 14 Sep 2016 10:22:46 -0600 Subject: [PATCH] resolved conflicts --- doc/html/Manual.html | 25 +- doc/html/Section_accelerate.html | 52 +- doc/html/Section_commands.html | 36 +- doc/html/Section_errors.html | 17 +- doc/html/Section_example.html | 15 +- doc/html/Section_history.html | 45 +- doc/html/Section_howto.html | 37 +- doc/html/Section_intro.html | 35 +- doc/html/Section_modify.html | 17 +- doc/html/Section_packages.html | 39 +- doc/html/Section_perf.html | 15 +- doc/html/Section_python.html | 27 +- doc/html/Section_start.html | 365 ++++--- doc/html/Section_tools.html | 25 +- doc/html/accelerate_gpu.html | 68 +- doc/html/accelerate_intel.html | 66 +- doc/html/accelerate_kokkos.html | 66 +- doc/html/accelerate_omp.html | 66 +- doc/html/accelerate_opt.html | 66 +- doc/html/angle_charmm.html | 89 +- doc/html/angle_class2.html | 89 +- doc/html/angle_coeff.html | 156 ++- doc/html/angle_cosine.html | 89 +- doc/html/angle_cosine_delta.html | 89 +- doc/html/angle_cosine_periodic.html | 89 +- doc/html/angle_cosine_shift.html | 89 +- doc/html/angle_cosine_shift_exp.html | 89 +- doc/html/angle_cosine_squared.html | 89 +- doc/html/angle_dipole.html | 89 +- doc/html/angle_fourier.html | 89 +- doc/html/angle_fourier_simple.html | 89 +- doc/html/angle_harmonic.html | 89 +- doc/html/angle_hybrid.html | 85 +- doc/html/angle_none.html | 85 +- doc/html/angle_quartic.html | 89 +- doc/html/angle_sdk.html | 85 +- doc/html/angle_style.html | 157 ++- doc/html/angle_table.html | 89 +- doc/html/angle_zero.html | 85 +- doc/html/angles.html | 304 ++++++ doc/html/atom_modify.html | 166 ++- doc/html/atom_style.html | 173 +++- doc/html/balance.html | 183 +++- doc/html/body.html | 52 +- doc/html/bond_class2.html | 80 +- doc/html/bond_coeff.html | 156 ++- doc/html/bond_fene.html | 80 +- doc/html/bond_fene_expand.html | 80 +- doc/html/bond_harmonic.html | 80 +- doc/html/bond_harmonic_shift.html | 80 +- doc/html/bond_harmonic_shift_cut.html | 80 +- doc/html/bond_hybrid.html | 76 +- doc/html/bond_morse.html | 80 +- doc/html/bond_none.html | 75 +- doc/html/bond_nonlinear.html | 80 +- doc/html/bond_quartic.html | 80 +- doc/html/bond_style.html | 157 ++- doc/html/bond_table.html | 80 +- doc/html/bond_write.html | 156 ++- doc/html/bond_zero.html | 76 +- doc/html/bonds.html | 286 ++++++ doc/html/boundary.html | 166 ++- doc/html/box.html | 166 ++- doc/html/change_box.html | 177 +++- doc/html/clear.html | 155 ++- doc/html/comm_modify.html | 167 ++- doc/html/comm_style.html | 157 ++- doc/html/commands.html | 446 ++++++++ doc/html/compute.html | 156 ++- doc/html/compute_ackland_atom.html | 170 +++- doc/html/compute_angle.html | 168 ++- doc/html/compute_angle_local.html | 184 +++- doc/html/compute_angmom_chunk.html | 172 +++- doc/html/compute_basal_atom.html | 170 +++- doc/html/compute_body_local.html | 186 +++- doc/html/compute_bond.html | 168 ++- doc/html/compute_bond_local.html | 184 +++- doc/html/compute_centro_atom.html | 171 +++- doc/html/compute_chunk_atom.html | 193 +++- doc/html/compute_cluster_atom.html | 170 +++- doc/html/compute_cna_atom.html | 170 +++- doc/html/compute_com.html | 168 ++- doc/html/compute_com_chunk.html | 172 +++- doc/html/compute_contact_atom.html | 170 +++- doc/html/compute_coord_atom.html | 170 +++- doc/html/compute_damage_atom.html | 170 +++- doc/html/compute_dihedral.html | 168 ++- doc/html/compute_dihedral_local.html | 184 +++- doc/html/compute_dilatation_atom.html | 168 ++- doc/html/compute_dipole_chunk.html | 172 +++- doc/html/compute_displace_atom.html | 170 +++- doc/html/compute_dpd.html | 168 ++- doc/html/compute_dpd_atom.html | 170 +++- doc/html/compute_erotate_asphere.html | 169 +++- doc/html/compute_erotate_rigid.html | 170 +++- doc/html/compute_erotate_sphere.html | 170 +++- doc/html/compute_erotate_sphere_atom.html | 170 +++- doc/html/compute_event_displace.html | 170 +++- doc/html/compute_fep.html | 198 +++- doc/html/compute_group_group.html | 187 +++- doc/html/compute_gyration.html | 170 +++- doc/html/compute_gyration_chunk.html | 188 +++- doc/html/compute_heat_flux.html | 168 ++- doc/html/compute_hexorder_atom.html | 186 +++- doc/html/compute_improper.html | 168 ++- doc/html/compute_improper_local.html | 184 +++- doc/html/compute_inertia_chunk.html | 172 +++- doc/html/compute_ke.html | 170 +++- doc/html/compute_ke_atom.html | 170 +++- doc/html/compute_ke_atom_eff.html | 170 +++- doc/html/compute_ke_eff.html | 169 +++- doc/html/compute_ke_rigid.html | 170 +++- doc/html/compute_meso_e_atom.html | 170 +++- doc/html/compute_meso_rho_atom.html | 170 +++- doc/html/compute_meso_t_atom.html | 170 +++- doc/html/compute_modify.html | 170 +++- doc/html/compute_msd.html | 185 +++- doc/html/compute_msd_chunk.html | 170 +++- doc/html/compute_msd_nongauss.html | 185 +++- doc/html/compute_omega_chunk.html | 172 +++- doc/html/compute_orientorder_atom.html | 184 +++- doc/html/compute_pair.html | 169 +++- doc/html/compute_pair_local.html | 193 +++- doc/html/compute_pe.html | 170 +++- doc/html/compute_pe_atom.html | 170 +++- doc/html/compute_plasticity_atom.html | 168 ++- doc/html/compute_pressure.html | 172 +++- doc/html/compute_property_atom.html | 203 +++- doc/html/compute_property_chunk.html | 183 +++- doc/html/compute_property_local.html | 192 +++- doc/html/compute_rdf.html | 170 +++- doc/html/compute_reduce.html | 199 +++- doc/html/compute_rigid_local.html | 192 +++- doc/html/compute_saed.html | 191 +++- doc/html/compute_slice.html | 190 +++- doc/html/compute_smd_contact_radius.html | 170 +++- doc/html/compute_smd_damage.html | 168 ++- doc/html/compute_smd_hourglass_error.html | 168 ++- doc/html/compute_smd_internal_energy.html | 168 ++- doc/html/compute_smd_plastic_strain.html | 168 ++- doc/html/compute_smd_plastic_strain_rate.html | 168 ++- doc/html/compute_smd_rho.html | 168 ++- doc/html/compute_smd_tlsph_defgrad.html | 168 ++- doc/html/compute_smd_tlsph_dt.html | 168 ++- doc/html/compute_smd_tlsph_num_neighs.html | 168 ++- doc/html/compute_smd_tlsph_shape.html | 168 ++- doc/html/compute_smd_tlsph_strain.html | 168 ++- doc/html/compute_smd_tlsph_strain_rate.html | 168 ++- doc/html/compute_smd_tlsph_stress.html | 168 ++- .../compute_smd_triangle_mesh_vertices.html | 178 +++- doc/html/compute_smd_ulsph_num_neighs.html | 170 +++- doc/html/compute_smd_ulsph_strain.html | 170 +++- doc/html/compute_smd_ulsph_strain_rate.html | 170 +++- doc/html/compute_smd_ulsph_stress.html | 170 +++- doc/html/compute_smd_vol.html | 168 ++- doc/html/compute_sna_atom.html | 202 +++- doc/html/compute_stress_atom.html | 170 +++- doc/html/compute_tally.html | 168 ++- doc/html/compute_temp.html | 172 +++- doc/html/compute_temp_asphere.html | 184 +++- doc/html/compute_temp_body.html | 184 +++- doc/html/compute_temp_chunk.html | 200 +++- doc/html/compute_temp_com.html | 168 ++- doc/html/compute_temp_cs.html | 172 +++- doc/html/compute_temp_deform.html | 168 ++- doc/html/compute_temp_deform_eff.html | 168 ++- doc/html/compute_temp_drude.html | 168 ++- doc/html/compute_temp_eff.html | 168 ++- doc/html/compute_temp_partial.html | 172 +++- doc/html/compute_temp_profile.html | 193 +++- doc/html/compute_temp_ramp.html | 169 +++- doc/html/compute_temp_region.html | 168 ++- doc/html/compute_temp_region_eff.html | 168 ++- doc/html/compute_temp_rotate.html | 168 ++- doc/html/compute_temp_sphere.html | 185 +++- doc/html/compute_ti.html | 186 +++- doc/html/compute_torque_chunk.html | 172 +++- doc/html/compute_vacf.html | 168 ++- doc/html/compute_vcm_chunk.html | 171 +++- doc/html/compute_voronoi_atom.html | 188 +++- doc/html/compute_xrd.html | 517 ++++++++-- doc/html/computes.html | 470 +++++++++ doc/html/create_atoms.html | 175 +++- doc/html/create_bonds.html | 156 ++- doc/html/create_box.html | 174 +++- doc/html/delete_atoms.html | 172 +++- doc/html/delete_bonds.html | 166 ++- doc/html/dielectric.html | 157 ++- doc/html/dihedral_charmm.html | 122 ++- doc/html/dihedral_class2.html | 122 ++- doc/html/dihedral_coeff.html | 157 ++- doc/html/dihedral_cosine_shift_exp.html | 122 ++- doc/html/dihedral_fourier.html | 124 ++- doc/html/dihedral_harmonic.html | 122 ++- doc/html/dihedral_helix.html | 122 ++- doc/html/dihedral_hybrid.html | 118 ++- doc/html/dihedral_multi_harmonic.html | 122 ++- doc/html/dihedral_nharmonic.html | 122 ++- doc/html/dihedral_none.html | 118 ++- doc/html/dihedral_opls.html | 122 ++- doc/html/dihedral_quadratic.html | 122 ++- doc/html/dihedral_spherical.html | 120 ++- doc/html/dihedral_style.html | 157 ++- doc/html/dihedral_table.html | 122 ++- doc/html/dihedral_zero.html | 116 ++- doc/html/dihedrals.html | 356 +++++++ doc/html/dimension.html | 159 ++- doc/html/displace_atoms.html | 172 +++- doc/html/dump.html | 191 +++- doc/html/dump_custom_vtk.html | 193 +++- doc/html/dump_h5md.html | 180 +++- doc/html/dump_image.html | 241 ++++- doc/html/dump_modify.html | 181 +++- doc/html/dump_molfile.html | 157 ++- doc/html/echo.html | 156 ++- doc/html/fix.html | 156 ++- doc/html/fix_adapt.html | 281 +++++- doc/html/fix_adapt_fep.html | 281 +++++- doc/html/fix_addforce.html | 279 ++++- doc/html/fix_addtorque.html | 253 ++++- doc/html/fix_append_atoms.html | 273 ++++- doc/html/fix_atc.html | 254 ++++- doc/html/fix_atom_swap.html | 282 +++++- doc/html/fix_ave_atom.html | 277 ++++- doc/html/fix_ave_chunk.html | 292 +++++- doc/html/fix_ave_correlate.html | 286 +++++- doc/html/fix_ave_correlate_long.html | 283 +++++- doc/html/fix_ave_histo.html | 292 +++++- doc/html/fix_ave_time.html | 287 +++++- doc/html/fix_aveforce.html | 278 ++++- doc/html/fix_balance.html | 286 +++++- doc/html/fix_bond_break.html | 279 ++++- doc/html/fix_bond_create.html | 282 +++++- doc/html/fix_bond_swap.html | 253 ++++- doc/html/fix_box_relax.html | 264 ++++- doc/html/fix_colvars.html | 270 ++++- doc/html/fix_controller.html | 287 +++++- doc/html/fix_deform.html | 294 +++++- doc/html/fix_deposit.html | 282 +++++- doc/html/fix_drag.html | 253 ++++- doc/html/fix_drude.html | 253 ++++- doc/html/fix_drude_transform.html | 253 ++++- doc/html/fix_dt_reset.html | 254 ++++- doc/html/fix_efield.html | 275 ++++- doc/html/fix_ehex.html | 275 ++++- doc/html/fix_enforce2d.html | 256 ++++- doc/html/fix_eos_cv.html | 253 ++++- doc/html/fix_eos_table.html | 253 ++++- doc/html/fix_eos_table_rx.html | 253 ++++- doc/html/fix_evaporate.html | 279 ++++- doc/html/fix_external.html | 265 ++++- doc/html/fix_flow_gauss.html | 275 ++++- doc/html/fix_freeze.html | 257 ++++- doc/html/fix_gcmc.html | 291 +++++- doc/html/fix_gld.html | 285 +++++- doc/html/fix_gle.html | 304 +++++- doc/html/fix_gravity.html | 276 ++++- doc/html/fix_heat.html | 278 ++++- doc/html/fix_imd.html | 268 ++++- doc/html/fix_indent.html | 272 ++++- doc/html/fix_ipi.html | 257 ++++- doc/html/fix_langevin.html | 286 +++++- doc/html/fix_langevin_drude.html | 288 +++++- doc/html/fix_langevin_eff.html | 276 ++++- doc/html/fix_lb_fluid.html | 284 +++++- doc/html/fix_lb_momentum.html | 273 ++++- doc/html/fix_lb_pc.html | 253 ++++- doc/html/fix_lb_rigid_pc_sphere.html | 275 ++++- doc/html/fix_lb_viscous.html | 253 ++++- doc/html/fix_lineforce.html | 253 ++++- doc/html/fix_manifoldforce.html | 253 ++++- doc/html/fix_meso.html | 253 ++++- doc/html/fix_meso_stationary.html | 253 ++++- doc/html/fix_modify.html | 170 +++- doc/html/fix_momentum.html | 271 ++++- doc/html/fix_move.html | 274 ++++- doc/html/fix_msst.html | 276 ++++- doc/html/fix_neb.html | 271 ++++- doc/html/fix_nh.html | 271 ++++- doc/html/fix_nh_eff.html | 264 ++++- doc/html/fix_nph_asphere.html | 257 ++++- doc/html/fix_nph_body.html | 257 ++++- doc/html/fix_nph_sphere.html | 257 ++++- doc/html/fix_nphug.html | 265 ++++- doc/html/fix_npt_asphere.html | 257 ++++- doc/html/fix_npt_body.html | 257 ++++- doc/html/fix_npt_sphere.html | 257 ++++- doc/html/fix_nve.html | 257 ++++- doc/html/fix_nve_asphere.html | 257 ++++- doc/html/fix_nve_asphere_noforce.html | 253 ++++- doc/html/fix_nve_body.html | 255 ++++- doc/html/fix_nve_eff.html | 253 ++++- doc/html/fix_nve_limit.html | 253 ++++- doc/html/fix_nve_line.html | 257 ++++- doc/html/fix_nve_manifold_rattle.html | 282 +++++- doc/html/fix_nve_noforce.html | 253 ++++- doc/html/fix_nve_sphere.html | 270 ++++- doc/html/fix_nve_tri.html | 261 ++++- doc/html/fix_nvt_asphere.html | 257 ++++- doc/html/fix_nvt_body.html | 257 ++++- doc/html/fix_nvt_manifold_rattle.html | 282 +++++- doc/html/fix_nvt_sllod.html | 258 ++++- doc/html/fix_nvt_sllod_eff.html | 254 ++++- doc/html/fix_nvt_sphere.html | 257 ++++- doc/html/fix_oneway.html | 253 ++++- doc/html/fix_orient.html | 252 ++++- doc/html/fix_phonon.html | 287 +++++- doc/html/fix_pimd.html | 269 ++++- doc/html/fix_planeforce.html | 253 ++++- doc/html/fix_poems.html | 265 ++++- doc/html/fix_pour.html | 279 ++++- doc/html/fix_press_berendsen.html | 264 ++++- doc/html/fix_print.html | 276 ++++- doc/html/fix_property_atom.html | 275 ++++- doc/html/fix_qbmsst.html | 276 ++++- doc/html/fix_qeq.html | 284 +++++- doc/html/fix_qeq_comb.html | 280 ++++- doc/html/fix_qeq_reax.html | 257 ++++- doc/html/fix_qmmm.html | 252 ++++- doc/html/fix_qtb.html | 270 ++++- doc/html/fix_reax_bonds.html | 253 ++++- doc/html/fix_reaxc_species.html | 282 +++++- doc/html/fix_recenter.html | 273 ++++- doc/html/fix_restrain.html | 268 ++++- doc/html/fix_rigid.html | 279 ++++- doc/html/fix_rx.html | 255 ++++- doc/html/fix_saed_vtk.html | 276 ++++- doc/html/fix_setforce.html | 279 ++++- doc/html/fix_shake.html | 289 +++++- doc/html/fix_shardlow.html | 259 ++++- doc/html/fix_smd.html | 271 ++++- doc/html/fix_smd_adjust_dt.html | 266 ++++- doc/html/fix_smd_integrate_tlsph.html | 253 ++++- doc/html/fix_smd_integrate_ulsph.html | 253 ++++- .../fix_smd_move_triangulated_surface.html | 266 ++++- doc/html/fix_smd_setvel.html | 274 ++++- doc/html/fix_smd_wall_surface.html | 272 ++++- doc/html/fix_spring.html | 266 ++++- doc/html/fix_spring_chunk.html | 253 ++++- doc/html/fix_spring_rg.html | 253 ++++- doc/html/fix_spring_self.html | 253 ++++- doc/html/fix_srd.html | 285 +++++- doc/html/fix_store_force.html | 253 ++++- doc/html/fix_store_state.html | 282 +++++- doc/html/fix_temp_berendsen.html | 269 ++++- doc/html/fix_temp_csvr.html | 272 ++++- doc/html/fix_temp_rescale.html | 275 ++++- doc/html/fix_temp_rescale_eff.html | 253 ++++- doc/html/fix_tfmc.html | 279 ++++- doc/html/fix_thermal_conductivity.html | 279 ++++- doc/html/fix_ti_rs.html | 272 ++++- doc/html/fix_ti_spring.html | 277 ++++- doc/html/fix_tmd.html | 252 ++++- doc/html/fix_ttm.html | 274 ++++- doc/html/fix_tune_kspace.html | 255 ++++- doc/html/fix_vector.html | 272 ++++- doc/html/fix_viscosity.html | 284 +++++- doc/html/fix_viscous.html | 269 ++++- doc/html/fix_wall.html | 278 ++++- doc/html/fix_wall_gran.html | 300 +++++- doc/html/fix_wall_piston.html | 273 ++++- doc/html/fix_wall_reflect.html | 281 +++++- doc/html/fix_wall_region.html | 253 ++++- doc/html/fix_wall_srd.html | 277 ++++- doc/html/fixes.html | 640 ++++++++++++ doc/html/genindex.html | 15 +- doc/html/group.html | 169 +++- doc/html/group2ndx.html | 156 ++- doc/html/if.html | 164 ++- doc/html/improper_class2.html | 74 +- doc/html/improper_coeff.html | 156 ++- doc/html/improper_cossq.html | 74 +- doc/html/improper_cvff.html | 74 +- doc/html/improper_distance.html | 70 +- doc/html/improper_fourier.html | 74 +- doc/html/improper_harmonic.html | 74 +- doc/html/improper_hybrid.html | 70 +- doc/html/improper_none.html | 70 +- doc/html/improper_ring.html | 74 +- doc/html/improper_style.html | 157 ++- doc/html/improper_umbrella.html | 74 +- doc/html/improper_zero.html | 64 +- doc/html/impropers.html | 274 +++++ doc/html/include.html | 156 ++- doc/html/info.html | 157 ++- doc/html/jump.html | 156 ++- doc/html/kspace_modify.html | 164 ++- doc/html/kspace_style.html | 170 +++- doc/html/label.html | 155 ++- doc/html/lattice.html | 175 +++- doc/html/log.html | 158 ++- doc/html/manifolds.html | 62 +- doc/html/mass.html | 155 ++- doc/html/min_modify.html | 164 ++- doc/html/min_style.html | 157 ++- doc/html/minimize.html | 156 ++- doc/html/molecule.html | 173 +++- doc/html/neb.html | 200 +++- doc/html/neigh_modify.html | 164 ++- doc/html/neighbor.html | 157 ++- doc/html/newton.html | 157 ++- doc/html/next.html | 156 ++- doc/html/package.html | 167 ++- doc/html/pair_adp.html | 414 +++++++- doc/html/pair_airebo.html | 414 +++++++- doc/html/pair_awpmd.html | 424 +++++++- doc/html/pair_beck.html | 414 +++++++- doc/html/pair_body.html | 412 +++++++- doc/html/pair_bop.html | 411 +++++++- doc/html/pair_born.html | 414 +++++++- doc/html/pair_brownian.html | 411 +++++++- doc/html/pair_buck.html | 414 +++++++- doc/html/pair_buck_long.html | 434 +++++++- doc/html/pair_charmm.html | 414 +++++++- doc/html/pair_class2.html | 414 +++++++- doc/html/pair_coeff.html | 156 ++- doc/html/pair_colloid.html | 414 +++++++- doc/html/pair_comb.html | 414 +++++++- doc/html/pair_coul.html | 414 +++++++- doc/html/pair_coul_diel.html | 410 +++++++- doc/html/pair_cs.html | 412 +++++++- doc/html/pair_dipole.html | 432 +++++++- doc/html/pair_dpd.html | 414 +++++++- doc/html/pair_dpd_fdt.html | 410 +++++++- doc/html/pair_dsmc.html | 410 +++++++- doc/html/pair_eam.html | 414 +++++++- doc/html/pair_edip.html | 414 +++++++- doc/html/pair_eff.html | 421 +++++++- doc/html/pair_eim.html | 414 +++++++- doc/html/pair_exp6_rx.html | 410 +++++++- doc/html/pair_gauss.html | 414 +++++++- doc/html/pair_gayberne.html | 414 +++++++- doc/html/pair_gran.html | 414 +++++++- doc/html/pair_gromacs.html | 414 +++++++- doc/html/pair_hbond_dreiding.html | 414 +++++++- doc/html/pair_hybrid.html | 414 +++++++- doc/html/pair_kim.html | 410 +++++++- doc/html/pair_lcbop.html | 410 +++++++- doc/html/pair_line_lj.html | 410 +++++++- doc/html/pair_list.html | 426 +++++++- doc/html/pair_lj.html | 414 +++++++- doc/html/pair_lj96.html | 414 +++++++- doc/html/pair_lj_cubic.html | 414 +++++++- doc/html/pair_lj_expand.html | 414 +++++++- doc/html/pair_lj_long.html | 414 +++++++- doc/html/pair_lj_sf.html | 414 +++++++- doc/html/pair_lj_smooth.html | 414 +++++++- doc/html/pair_lj_smooth_linear.html | 414 +++++++- doc/html/pair_lj_soft.html | 418 +++++++- doc/html/pair_lubricate.html | 410 +++++++- doc/html/pair_lubricateU.html | 410 +++++++- doc/html/pair_mdf.html | 420 +++++++- doc/html/pair_meam.html | 410 +++++++- doc/html/pair_meam_spline.html | 414 +++++++- doc/html/pair_meam_sw_spline.html | 410 +++++++- doc/html/pair_mgpt.html | 411 +++++++- doc/html/pair_mie.html | 410 +++++++- doc/html/pair_modify.html | 186 +++- doc/html/pair_morse.html | 414 +++++++- doc/html/pair_multi_lucy.html | 410 +++++++- doc/html/pair_multi_lucy_rx.html | 410 +++++++- doc/html/pair_nb3b_harmonic.html | 414 +++++++- doc/html/pair_nm.html | 424 +++++++- doc/html/pair_none.html | 410 +++++++- doc/html/pair_peri.html | 414 +++++++- doc/html/pair_polymorphic.html | 410 +++++++- doc/html/pair_quip.html | 410 +++++++- doc/html/pair_reax.html | 411 +++++++- doc/html/pair_reax_c.html | 434 +++++++- doc/html/pair_resquared.html | 414 +++++++- doc/html/pair_sdk.html | 414 +++++++- doc/html/pair_smd_hertz.html | 410 +++++++- doc/html/pair_smd_tlsph.html | 410 +++++++- doc/html/pair_smd_triangulated_surface.html | 410 +++++++- doc/html/pair_smd_ulsph.html | 410 +++++++- doc/html/pair_smtbq.html | 410 +++++++- doc/html/pair_snap.html | 410 +++++++- doc/html/pair_soft.html | 414 +++++++- doc/html/pair_sph_heatconduction.html | 410 +++++++- doc/html/pair_sph_idealgas.html | 410 +++++++- doc/html/pair_sph_lj.html | 410 +++++++- doc/html/pair_sph_rhosum.html | 410 +++++++- doc/html/pair_sph_taitwater.html | 410 +++++++- doc/html/pair_sph_taitwater_morris.html | 410 +++++++- doc/html/pair_srp.html | 430 +++++++- doc/html/pair_style.html | 157 ++- doc/html/pair_sw.html | 414 +++++++- doc/html/pair_table.html | 414 +++++++- doc/html/pair_table_rx.html | 410 +++++++- doc/html/pair_tersoff.html | 414 +++++++- doc/html/pair_tersoff_mod.html | 414 +++++++- doc/html/pair_tersoff_zbl.html | 414 +++++++- doc/html/pair_thole.html | 414 +++++++- doc/html/pair_tri_lj.html | 410 +++++++- doc/html/pair_vashishta.html | 414 +++++++- doc/html/pair_write.html | 156 ++- doc/html/pair_yukawa.html | 414 +++++++- doc/html/pair_yukawa_colloid.html | 414 +++++++- doc/html/pair_zbl.html | 414 +++++++- doc/html/pair_zero.html | 410 +++++++- doc/html/pairs.html | 954 ++++++++++++++++++ doc/html/partition.html | 158 ++- doc/html/prd.html | 192 +++- doc/html/print.html | 170 +++- doc/html/processors.html | 170 +++- doc/html/python.html | 166 ++- doc/html/quit.html | 156 ++- doc/html/read_data.html | 490 ++++++--- doc/html/read_dump.html | 178 +++- doc/html/read_restart.html | 156 ++- doc/html/region.html | 184 +++- doc/html/replicate.html | 155 ++- doc/html/rerun.html | 167 ++- doc/html/reset_timestep.html | 156 ++- doc/html/restart.html | 179 +++- doc/html/run.html | 170 +++- doc/html/run_style.html | 191 +++- doc/html/search.html | 15 +- doc/html/set.html | 172 +++- doc/html/shell.html | 162 ++- doc/html/special_bonds.html | 166 ++- doc/html/suffix.html | 156 ++- doc/html/tad.html | 190 +++- doc/html/temper.html | 158 ++- doc/html/thermo.html | 157 ++- doc/html/thermo_modify.html | 164 ++- doc/html/thermo_style.html | 183 +++- doc/html/timer.html | 157 ++- doc/html/timestep.html | 157 ++- doc/html/tutorial_drude.html | 46 +- doc/html/tutorial_github.html | 46 +- doc/html/tutorials.html | 240 +++++ doc/html/uncompute.html | 156 ++- doc/html/undump.html | 156 ++- doc/html/unfix.html | 156 ++- doc/html/units.html | 156 ++- doc/html/variable.html | 196 +++- doc/html/velocity.html | 175 +++- doc/html/write_coeff.html | 156 ++- doc/html/write_data.html | 170 +++- doc/html/write_dump.html | 157 ++- doc/html/write_restart.html | 169 +++- doc/src/Manual.txt | 24 +- doc/src/Section_accelerate.txt | 26 +- doc/src/Section_commands.txt | 3 +- doc/src/Section_errors.txt | 2 +- doc/src/Section_history.txt | 28 +- doc/src/Section_howto.txt | 16 +- doc/src/Section_intro.txt | 20 +- doc/src/Section_modify.txt | 2 +- doc/src/Section_packages.txt | 24 +- doc/src/Section_python.txt | 20 +- doc/src/Section_start.txt | 194 ++-- doc/src/Section_tools.txt | 9 +- doc/src/accelerate_gpu.txt | 4 +- doc/src/accelerate_intel.txt | 2 +- doc/src/accelerate_kokkos.txt | 2 +- doc/src/accelerate_omp.txt | 2 +- doc/src/accelerate_opt.txt | 2 +- doc/src/angle_charmm.txt | 4 +- doc/src/angle_class2.txt | 4 +- doc/src/angle_cosine.txt | 4 +- doc/src/angle_cosine_delta.txt | 4 +- doc/src/angle_cosine_periodic.txt | 4 +- doc/src/angle_cosine_shift.txt | 4 +- doc/src/angle_cosine_shift_exp.txt | 4 +- doc/src/angle_cosine_squared.txt | 4 +- doc/src/angle_dipole.txt | 4 +- doc/src/angle_fourier.txt | 4 +- doc/src/angle_fourier_simple.txt | 4 +- doc/src/angle_harmonic.txt | 4 +- doc/src/angle_quartic.txt | 4 +- doc/src/angle_table.txt | 4 +- doc/src/angles.txt | 27 + doc/src/atom_style.txt | 8 +- doc/src/balance.txt | 3 +- doc/src/body.txt | 10 +- doc/src/bond_class2.txt | 4 +- doc/src/bond_fene.txt | 4 +- doc/src/bond_fene_expand.txt | 4 +- doc/src/bond_harmonic.txt | 4 +- doc/src/bond_harmonic_shift.txt | 4 +- doc/src/bond_harmonic_shift_cut.txt | 4 +- doc/src/bond_morse.txt | 4 +- doc/src/bond_nonlinear.txt | 4 +- doc/src/bond_quartic.txt | 4 +- doc/src/bond_table.txt | 4 +- doc/src/bonds.txt | 22 + doc/src/boundary.txt | 2 +- doc/src/change_box.txt | 2 +- doc/src/commands.txt | 109 ++ doc/src/compute_ackland_atom.txt | 2 +- doc/src/compute_angmom_chunk.txt | 8 +- doc/src/compute_basal_atom.txt | 4 +- doc/src/compute_body_local.txt | 2 +- doc/src/compute_centro_atom.txt | 4 +- doc/src/compute_chunk_atom.txt | 8 +- doc/src/compute_cluster_atom.txt | 2 +- doc/src/compute_cna_atom.txt | 2 +- doc/src/compute_com_chunk.txt | 8 +- doc/src/compute_contact_atom.txt | 2 +- doc/src/compute_coord_atom.txt | 4 +- doc/src/compute_damage_atom.txt | 2 +- doc/src/compute_dipole_chunk.txt | 8 +- doc/src/compute_displace_atom.txt | 4 +- doc/src/compute_dpd_atom.txt | 2 +- doc/src/compute_erotate_asphere.txt | 2 +- doc/src/compute_erotate_rigid.txt | 2 +- doc/src/compute_erotate_sphere.txt | 2 +- doc/src/compute_erotate_sphere_atom.txt | 2 +- doc/src/compute_event_displace.txt | 2 +- doc/src/compute_fep.txt | 4 +- doc/src/compute_gyration.txt | 4 +- doc/src/compute_gyration_chunk.txt | 4 +- doc/src/compute_hexorder_atom.txt | 4 +- doc/src/compute_inertia_chunk.txt | 8 +- doc/src/compute_ke.txt | 2 +- doc/src/compute_ke_atom.txt | 2 +- doc/src/compute_ke_atom_eff.txt | 2 +- doc/src/compute_ke_eff.txt | 2 +- doc/src/compute_ke_rigid.txt | 4 +- doc/src/compute_meso_e_atom.txt | 2 +- doc/src/compute_meso_rho_atom.txt | 2 +- doc/src/compute_meso_t_atom.txt | 2 +- doc/src/compute_msd_chunk.txt | 4 +- doc/src/compute_omega_chunk.txt | 8 +- doc/src/compute_orientorder_atom.txt | 4 +- doc/src/compute_pe.txt | 4 +- doc/src/compute_pe_atom.txt | 2 +- doc/src/compute_pressure.txt | 4 +- doc/src/compute_property_chunk.txt | 4 +- doc/src/compute_rdf.txt | 2 +- doc/src/compute_reduce.txt | 2 +- doc/src/compute_smd_contact_radius.txt | 2 +- .../compute_smd_triangle_mesh_vertices.txt | 12 +- doc/src/compute_smd_ulsph_num_neighs.txt | 2 +- doc/src/compute_smd_ulsph_strain.txt | 2 +- doc/src/compute_smd_ulsph_strain_rate.txt | 4 +- doc/src/compute_smd_ulsph_stress.txt | 4 +- doc/src/compute_sna_atom.txt | 4 +- doc/src/compute_stress_atom.txt | 4 +- doc/src/compute_temp.txt | 4 +- doc/src/compute_temp_chunk.txt | 8 +- doc/src/compute_temp_cs.txt | 6 +- doc/src/compute_temp_partial.txt | 4 +- doc/src/compute_ti.txt | 4 +- doc/src/compute_torque_chunk.txt | 6 +- doc/src/compute_vcm_chunk.txt | 8 +- doc/src/compute_voronoi_atom.txt | 4 +- doc/src/compute_xrd.txt | 86 +- doc/src/computes.txt | 120 +++ doc/src/create_box.txt | 2 +- doc/src/dihedral_charmm.txt | 4 +- doc/src/dihedral_class2.txt | 4 +- doc/src/dihedral_coeff.txt | 2 - doc/src/dihedral_cosine_shift_exp.txt | 4 +- doc/src/dihedral_fourier.txt | 6 +- doc/src/dihedral_harmonic.txt | 4 +- doc/src/dihedral_helix.txt | 4 +- doc/src/dihedral_multi_harmonic.txt | 4 +- doc/src/dihedral_nharmonic.txt | 4 +- doc/src/dihedral_opls.txt | 4 +- doc/src/dihedral_quadratic.txt | 4 +- doc/src/dihedral_spherical.txt | 2 +- doc/src/dihedral_table.txt | 4 +- doc/src/dihedrals.txt | 39 + doc/src/dimension.txt | 2 +- doc/src/dump.txt | 2 +- doc/src/dump_custom_vtk.txt | 2 +- doc/src/dump_image.txt | 2 +- doc/src/fix_addforce.txt | 4 +- doc/src/fix_ave_chunk.txt | 4 +- doc/src/fix_aveforce.txt | 4 +- doc/src/fix_balance.txt | 3 +- doc/src/fix_deform.txt | 4 +- doc/src/fix_enforce2d.txt | 4 +- doc/src/fix_freeze.txt | 4 +- doc/src/fix_gle.txt | 14 +- doc/src/fix_gravity.txt | 4 +- doc/src/fix_ipi.txt | 4 +- doc/src/fix_langevin.txt | 4 +- doc/src/fix_lb_rigid_pc_sphere.txt | 2 +- doc/src/fix_neb.txt | 8 +- doc/src/fix_nh.txt | 4 +- doc/src/fix_nph_asphere.txt | 4 +- doc/src/fix_nph_body.txt | 4 +- doc/src/fix_nph_sphere.txt | 4 +- doc/src/fix_nphug.txt | 4 +- doc/src/fix_npt_asphere.txt | 4 +- doc/src/fix_npt_body.txt | 4 +- doc/src/fix_npt_sphere.txt | 4 +- doc/src/fix_nve.txt | 4 +- doc/src/fix_nve_asphere.txt | 4 +- doc/src/fix_nve_body.txt | 4 +- doc/src/fix_nve_line.txt | 4 +- doc/src/fix_nve_manifold_rattle.txt | 4 +- doc/src/fix_nve_sphere.txt | 4 +- doc/src/fix_nve_tri.txt | 8 +- doc/src/fix_nvt_asphere.txt | 4 +- doc/src/fix_nvt_body.txt | 4 +- doc/src/fix_nvt_manifold_rattle.txt | 4 +- doc/src/fix_nvt_sllod.txt | 4 +- doc/src/fix_nvt_sphere.txt | 4 +- doc/src/fix_qeq_comb.txt | 4 +- doc/src/fix_qeq_reax.txt | 4 +- doc/src/fix_rigid.txt | 4 +- doc/src/fix_rx.txt | 2 +- doc/src/fix_setforce.txt | 4 +- doc/src/fix_shake.txt | 4 +- doc/src/fix_shardlow.txt | 10 +- .../fix_smd_tlsph_reference_configuration.txt | 0 doc/src/fix_ti_spring.txt | 2 +- doc/src/fix_tune_kspace.txt | 2 - doc/src/fix_viscosity.txt | 4 +- doc/src/fix_wall_reflect.txt | 4 +- doc/src/fixes.txt | 156 +++ doc/src/group.txt | 2 +- doc/src/if.txt | 2 +- doc/src/improper_class2.txt | 4 +- doc/src/improper_cossq.txt | 4 +- doc/src/improper_cvff.txt | 4 +- doc/src/improper_fourier.txt | 4 +- doc/src/improper_harmonic.txt | 4 +- doc/src/improper_ring.txt | 4 +- doc/src/improper_umbrella.txt | 4 +- doc/src/impropers.txt | 20 + doc/src/kspace_style.txt | 6 +- doc/src/log.txt | 2 +- doc/src/manifolds.txt | 32 +- doc/src/molecule.txt | 1 - doc/src/neb.txt | 23 +- doc/src/pair_adp.txt | 4 +- doc/src/pair_airebo.txt | 4 +- doc/src/pair_beck.txt | 4 +- doc/src/pair_body.txt | 2 +- doc/src/pair_born.txt | 4 +- doc/src/pair_buck.txt | 4 +- doc/src/pair_buck_long.txt | 6 +- doc/src/pair_charmm.txt | 4 +- doc/src/pair_class2.txt | 4 +- doc/src/pair_colloid.txt | 4 +- doc/src/pair_comb.txt | 4 +- doc/src/pair_coul.txt | 4 +- doc/src/pair_cs.txt | 2 +- doc/src/pair_dipole.txt | 4 +- doc/src/pair_dpd.txt | 4 +- doc/src/pair_eam.txt | 4 +- doc/src/pair_edip.txt | 4 +- doc/src/pair_eim.txt | 4 +- doc/src/pair_gauss.txt | 4 +- doc/src/pair_gayberne.txt | 4 +- doc/src/pair_gran.txt | 4 +- doc/src/pair_gromacs.txt | 4 +- doc/src/pair_hbond_dreiding.txt | 4 +- doc/src/pair_hybrid.txt | 4 +- doc/src/pair_lj.txt | 4 +- doc/src/pair_lj96.txt | 4 +- doc/src/pair_lj_cubic.txt | 4 +- doc/src/pair_lj_expand.txt | 4 +- doc/src/pair_lj_long.txt | 4 +- doc/src/pair_lj_sf.txt | 4 +- doc/src/pair_lj_smooth.txt | 4 +- doc/src/pair_lj_smooth_linear.txt | 4 +- doc/src/pair_lj_soft.txt | 7 +- doc/src/pair_meam_spline.txt | 4 +- doc/src/pair_morse.txt | 4 +- doc/src/pair_nb3b_harmonic.txt | 4 +- doc/src/pair_nm.txt | 4 +- doc/src/pair_peri.txt | 4 +- doc/src/pair_reax_c.txt | 12 +- doc/src/pair_resquared.txt | 4 +- doc/src/pair_sdk.txt | 4 +- doc/src/pair_soft.txt | 4 +- doc/src/pair_sw.txt | 4 +- doc/src/pair_table.txt | 4 +- doc/src/pair_tersoff.txt | 4 +- doc/src/pair_tersoff_mod.txt | 4 +- doc/src/pair_tersoff_zbl.txt | 4 +- doc/src/pair_thole.txt | 4 +- doc/src/pair_vashishta.txt | 4 +- doc/src/pair_yukawa.txt | 4 +- doc/src/pair_yukawa_colloid.txt | 4 +- doc/src/pair_zbl.txt | 4 +- doc/src/pairs.txt | 102 ++ doc/src/partition.txt | 2 +- doc/src/prd.txt | 4 +- doc/src/read_data.txt | 2 +- doc/src/read_restart.txt | 2 - doc/src/region.txt | 6 +- doc/src/run_style.txt | 12 +- doc/src/tad.txt | 4 +- doc/src/temper.txt | 2 +- doc/src/thermo_style.txt | 8 +- doc/src/tutorials.txt | 13 + doc/utils/converters/lammpsdoc/txt2html.py | 18 +- doc/utils/converters/lammpsdoc/txt2rst.py | 31 +- doc/utils/converters/tests/test_txt2rst.py | 53 +- 797 files changed, 123225 insertions(+), 4062 deletions(-) create mode 100644 doc/html/angles.html create mode 100644 doc/html/bonds.html create mode 100644 doc/html/commands.html create mode 100644 doc/html/computes.html create mode 100644 doc/html/dihedrals.html create mode 100644 doc/html/fixes.html create mode 100644 doc/html/impropers.html create mode 100644 doc/html/pairs.html create mode 100644 doc/html/tutorials.html create mode 100644 doc/src/angles.txt create mode 100644 doc/src/bonds.txt create mode 100644 doc/src/commands.txt create mode 100644 doc/src/computes.txt create mode 100644 doc/src/dihedrals.txt delete mode 100644 doc/src/fix_smd_tlsph_reference_configuration.txt create mode 100644 doc/src/fixes.txt create mode 100644 doc/src/impropers.txt create mode 100644 doc/src/pairs.txt create mode 100644 doc/src/tutorials.txt diff --git a/doc/html/Manual.html b/doc/html/Manual.html index 3e5e1a74a9..f4bba86437 100644 --- a/doc/html/Manual.html +++ b/doc/html/Manual.html @@ -72,7 +72,8 @@ -
-

Restrictions

+

5.3.4.1. Restrictions

None.

@@ -277,6 +320,15 @@ MPI tasks to a (multi-core) socket, should solve this issue.