Merge remote branch 'lammps-ro/master' into lammps-icms
15822b0927cc
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 4 2016, 14:11.

Description

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

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 4 2016, 14:11

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSddb83e1b7256: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14548 f3b2605a-c512-4ea7…
rLAMMPS4b4cde9eabf6: Merge branch 'merge-pull-25' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS15822b0927cc: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 4 2016, 14:11

Merged Changes

Commit	Author	Details	Committed
ddb83e1b7256	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14548 f3b2605a-c512-4ea7…	Feb 3 2016
21ee4aa97413	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14547 f3b2605a-c512-4ea7…	Feb 3 2016
c1aebdd391f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14544 f3b2605a-c512-4ea7…	Feb 3 2016
b25125e52943	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14543 f3b2605a-c512-4ea7…	Feb 3 2016
de6ff01ba7e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14542 f3b2605a-c512-4ea7…	Feb 3 2016
94da81bae410	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14541 f3b2605a-c512-4ea7…	Feb 3 2016
bb11aa314762	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14540 f3b2605a-c512-4ea7…	Feb 3 2016
22961a926718	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14539 f3b2605a-c512-4ea7…	Feb 3 2016
0963784ff1c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14538 f3b2605a-c512-4ea7…	Feb 3 2016
0662467254a2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14537 f3b2605a-c512-4ea7…	Feb 3 2016
1a82fbf0ac77	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14536 f3b2605a-c512-4ea7…	Feb 3 2016
216f83d10db5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14535 f3b2605a-c512-4ea7…	Feb 3 2016
8e9f616a2e56	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14534 f3b2605a-c512-4ea7…	Feb 3 2016
3e9a18b5bb7b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14533 f3b2605a-c512-4ea7…	Feb 3 2016
9cf43f2a0b7f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14532 f3b2605a-c512-4ea7…	Feb 2 2016
0766f95adc83	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14531 f3b2605a-c512-4ea7…	Feb 2 2016
2da2a3b03a30	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14530 f3b2605a-c512-4ea7…	Feb 2 2016

Changes (600)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

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