Diffusion lammps 3c2bebd4ac44

Merge remote-tracking branch 'upstream/lammps-icms' into…
3c2bebd4ac44
Actions

Authored by • richard on Jun 19 2016, 08:36.

Description

Merge remote-tracking branch 'upstream/lammps-icms' into improved_python_interface

Details

Committed

• richard

Jun 19 2016, 08:36

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSf876973bcccb: Merge remote-tracking branch 'upstream/lammps-icms' into…
rLAMMPS28a9a22aa614: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Richard <richard.berger@temple.edu> committed rLAMMPS3c2bebd4ac44: Merge remote-tracking branch 'upstream/lammps-icms' into… (authored by Richard <richard.berger@temple.edu>).Jun 19 2016, 08:36

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
28a9a22aa614	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jun 18 2016
4569c3876ca4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15207 f3b2605a-c512-4ea7…	Jun 18 2016
bcf79f62ebf1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15206 f3b2605a-c512-4ea7…	Jun 18 2016
6f6e08652e06	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15205 f3b2605a-c512-4ea7…	Jun 18 2016
143b72e7dabe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15204 f3b2605a-c512-4ea7…	Jun 18 2016
d55f968432a4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15203 f3b2605a-c512-4ea7…	Jun 18 2016
b161fbb52a36	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15202 f3b2605a-c512-4ea7…	Jun 18 2016
d89ee2a40dee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15201 f3b2605a-c512-4ea7…	Jun 18 2016
2fcd26f6c41b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15200 f3b2605a-c512-4ea7…	Jun 18 2016
e5fb28a6a092	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15199 f3b2605a-c512-4ea7…	Jun 18 2016
a90803641caa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15198 f3b2605a-c512-4ea7…	Jun 18 2016
46a9fe58aa6c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15197 f3b2605a-c512-4ea7…	Jun 18 2016
852b9eec186a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15195 f3b2605a-c512-4ea7…	Jun 17 2016
00438d62c0f4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15194 f3b2605a-c512-4ea7…	Jun 17 2016
530ede191b9f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15192 f3b2605a-c512-4ea7…	Jun 17 2016
8147c8f742b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15191 f3b2605a-c512-4ea7…	Jun 17 2016
503cd8206557	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15190 f3b2605a-c512-4ea7…	Jun 17 2016
b74ea86bcfe8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15189 f3b2605a-c512-4ea7…	Jun 17 2016
e135e3ee798f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15188 f3b2605a-c512-4ea7…	Jun 17 2016
951e7c916afe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15187 f3b2605a-c512-4ea7…	Jun 17 2016
e088eaa53b79	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15186 f3b2605a-c512-4ea7…	Jun 17 2016
e14cdede6390	Axel Kohlmeyer	mention in the individual fix documentation, if it supports fix_modify respa	Jun 17 2016
da8b07b4f090	Axel Kohlmeyer	update colvars library to version 2016-06-14	Jun 17 2016
a3f8b258a02f	Axel Kohlmeyer	add makefiles for GCC's address and undefined behavior sanitizer	Jun 17 2016
ad50d592e1c6	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jun 17 2016
81be4af2bb75	Axel Kohlmeyer	Merge branch 'merge-pull-98' into lammps-icms	Jun 16 2016
6251e04d2ddf	Axel Kohlmeyer	Merge branch 'require_atom_style_dpd' of https://github.com/timattox/lammps…	Jun 16 2016
0299c00af2c8	Axel Kohlmeyer	correct syntax for zbl USER-OMP demo	Jun 16 2016
51e86f6519dd	Axel Kohlmeyer	update syntax in respa for fixes tests	Jun 16 2016
5adc1859a162	Axel Kohlmeyer	Merge branch 'respa-for-fixes' into lammps-icms	Jun 16 2016
10e934b016cd	Axel Kohlmeyer	cleanup for fix ttm/mod	Jun 16 2016
8a5ab49d2c7c	Axel Kohlmeyer	fix smd/setvel doesn't really support r-RESPA. test for it and abend.	Jun 16 2016
101a1a459a04	Axel Kohlmeyer	add respa level support to a large number of fixes	Jun 16 2016
a23a2407a716	Tim Mattox	USER-DPD now requires atom_style dpd due to a recent change. Includes updates…	Jun 16 2016
6cb38b17d88a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15185 f3b2605a-c512-4ea7…	Jun 16 2016
b3ef33675852	Axel Kohlmeyer	Merge branch 'merge-pull-97' into lammps-icms	Jun 16 2016
c58909faff61	Axel Kohlmeyer	Merge branch 'comm2_USER-DPD' of https://github.com/timattox/lammps into merge…	Jun 16 2016
5640597ca27a	Tim Mattox	Remove some unneeded communications and memset calls in USER-DPD Gives about a…	Jun 16 2016
a3df07b9fc6c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15184 f3b2605a-c512-4ea7…	Jun 16 2016
6ba266492135	sjplimp	new orient/bcc for pull request #95	Jun 16 2016
8330ef7f7e2e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15182 f3b2605a-c512-4ea7…	Jun 16 2016
328224a2985c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15181 f3b2605a-c512-4ea7…	Jun 16 2016
3922c14fbcda	Axel Kohlmeyer	Merge branch 'lammps-icms' into respa-for-fixes	Jun 16 2016
69892822df05	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jun 16 2016
14994c04b03a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15180 f3b2605a-c512-4ea7…	Jun 16 2016
253bd4c3356c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15179 f3b2605a-c512-4ea7…	Jun 16 2016
e2c3ecb7e802	Axel Kohlmeyer	converted fix wall/region to support selecting RESPA level	Jun 16 2016
4298828d6a97	Axel Kohlmeyer	implement changes suggested by steve to move the fix_modify respa parsing into…	Jun 15 2016
92371fbdaffc	Axel Kohlmeyer	tweak output for respa levels	Jun 15 2016
96f118ff6bb0	Axel Kohlmeyer	implement tweaks requested by steve. also do not enforce respa being active and…	Jun 15 2016

Changes (347)

				Path
	M			doc/html/Manual.html
	P			doc/html/PDF/colvars-refman-lammps.pdf Copied from doc/src/PDF/colvars-refman-lammps.pdf
	M			doc/html/Section_commands.html
	M			doc/html/Section_start.html
	M			doc/html/_sources/Manual.txt
	M			doc/html/_sources/Section_commands.txt
	M			doc/html/_sources/Section_start.txt
	M			doc/html/_sources/accelerate_gpu.txt
	M			doc/html/_sources/bond_fene.txt
	M			doc/html/_sources/compute.txt
	M			doc/html/_sources/compute_reduce.txt
	A			doc/html/_sources/compute_rigid_local.txt
	M			doc/html/_sources/displace_atoms.txt
	M			doc/html/_sources/fix.txt
	M			doc/html/_sources/fix_addforce.txt
	M			doc/html/_sources/fix_addtorque.txt
	M			doc/html/_sources/fix_aveforce.txt
	M			doc/html/_sources/fix_drag.txt
	M			doc/html/_sources/fix_efield.txt
	M			doc/html/_sources/fix_ehex.txt
	M			doc/html/_sources/fix_enforce2d.txt
	M			doc/html/_sources/fix_freeze.txt
	M			doc/html/_sources/fix_gravity.txt
	M			doc/html/_sources/fix_indent.txt
	M			doc/html/_sources/fix_modify.txt
	V			doc/html/_sources/{fix_orient.txt ← fix_orient_fcc.txt}
	V			doc/html/_sources/{fix_orient_fcc.txt → fix_orient.txt}
	M			doc/html/_sources/fix_qeq_comb.txt
	M			doc/html/_sources/fix_recenter.txt
	M			doc/html/_sources/fix_restrain.txt
	M			doc/html/_sources/fix_rigid.txt
	M			doc/html/_sources/fix_setforce.txt
	M			doc/html/_sources/fix_shake.txt
	M			doc/html/_sources/fix_shardlow.txt
	M			doc/html/_sources/fix_smd.txt
	M			doc/html/_sources/fix_spring.txt
	A			doc/html/_sources/fix_spring_chunk.txt
	M			doc/html/_sources/fix_spring_rg.txt
	M			doc/html/_sources/fix_spring_self.txt
	M			doc/html/_sources/fix_viscous.txt
	M			doc/html/_sources/fix_wall.txt
	M			doc/html/_sources/fix_wall_region.txt
	M			doc/html/_sources/kspace_modify.txt
	M			doc/html/_sources/pair_dpd_fdt.txt
	M			doc/html/_sources/pair_gran.txt
	M			doc/html/_sources/pair_mgpt.txt
	M			doc/html/_sources/read_data.txt
	M			doc/html/_sources/read_restart.txt
	M			doc/html/_sources/run_style.txt
	M			doc/html/_sources/timer.txt
	M			doc/html/accelerate_gpu.html
	M			doc/html/bond_fene.html
	M			doc/html/compute.html
	M			doc/html/compute_reduce.html
	A			doc/html/compute_rigid_local.html
	M			doc/html/displace_atoms.html
	M			doc/html/fix.html
	M			doc/html/fix_addforce.html
	M			doc/html/fix_addtorque.html
	M			doc/html/fix_aveforce.html
	M			doc/html/fix_drag.html
	M			doc/html/fix_efield.html
	M			doc/html/fix_ehex.html
	M			doc/html/fix_enforce2d.html
	M			doc/html/fix_freeze.html
	M			doc/html/fix_gravity.html
	M			doc/html/fix_indent.html
	M			doc/html/fix_modify.html
	V			doc/html/{fix_orient.html ← fix_orient_fcc.html}
	V			doc/html/{fix_orient_fcc.html → fix_orient.html}
	M			doc/html/fix_qeq_comb.html
	M			doc/html/fix_recenter.html
	M			doc/html/fix_restrain.html
	M			doc/html/fix_rigid.html
	M			doc/html/fix_setforce.html
	M			doc/html/fix_shake.html
	M			doc/html/fix_shardlow.html
	M			doc/html/fix_smd.html
	M			doc/html/fix_spring.html
	P			doc/html/fix_spring_chunk.html Copied from doc/html/fix_spring_self.html
	M			doc/html/fix_spring_rg.html
	P			doc/html/fix_spring_self.html Copied to doc/html/fix_spring_chunk.html
	M			doc/html/fix_viscous.html
	M			doc/html/fix_wall.html
	M			doc/html/fix_wall_region.html
	M			doc/html/genindex.html
	M			doc/html/kspace_modify.html
	M			doc/html/pair_dpd_fdt.html
	M			doc/html/pair_gran.html
	M			doc/html/pair_mgpt.html
	M			doc/html/read_data.html
	M			doc/html/read_restart.html
	M			doc/html/run_style.html
	M			doc/html/searchindex.js
	M			doc/html/timer.html
	M			doc/src/Manual.txt
	P			doc/src/PDF/colvars-refman-lammps.pdf Copied to doc/html/PDF/colvars-refman-lammps.pdf
	M			doc/src/Section_commands.txt
	M			doc/src/Section_start.txt
	M			doc/src/bond_fene.txt
	M			doc/src/compute.txt
	M			doc/src/compute_reduce.txt
	A			doc/src/compute_rigid_local.txt
	M			doc/src/displace_atoms.txt
	M			doc/src/fix.txt
	M			doc/src/fix_addforce.txt
	M			doc/src/fix_addtorque.txt
	M			doc/src/fix_aveforce.txt
	M			doc/src/fix_drag.txt
	M			doc/src/fix_efield.txt
	M			doc/src/fix_ehex.txt
	M			doc/src/fix_enforce2d.txt
	M			doc/src/fix_freeze.txt
	M			doc/src/fix_gravity.txt
	M			doc/src/fix_indent.txt
	M			doc/src/fix_modify.txt
	V			doc/src/{fix_orient.txt ← fix_orient_fcc.txt}
	V			doc/src/{fix_orient_fcc.txt → fix_orient.txt}
	M			doc/src/fix_qeq_comb.txt
	M			doc/src/fix_recenter.txt
	M			doc/src/fix_restrain.txt
	M			doc/src/fix_rigid.txt
	M			doc/src/fix_setforce.txt
	M			doc/src/fix_shake.txt
	M			doc/src/fix_shardlow.txt
	M			doc/src/fix_smd.txt
	M			doc/src/fix_spring.txt
	A			doc/src/fix_spring_chunk.txt
	M			doc/src/fix_spring_rg.txt
	M			doc/src/fix_spring_self.txt
	M			doc/src/fix_viscous.txt
	M			doc/src/fix_wall.txt
	M			doc/src/fix_wall_region.txt
	M			doc/src/kspace_modify.txt
	M			doc/src/pair_dpd_fdt.txt
	M			doc/src/pair_gran.txt
	M			doc/src/pair_mgpt.txt
	M			doc/src/read_data.txt
	M			doc/src/read_restart.txt
	M			doc/src/run_style.txt
	M			doc/src/timer.txt
	M			examples/USER/dpd/dpd-shardlow/data.dpd
	M			examples/USER/dpd/dpd-shardlow/in.dpd-shardlow
	M			examples/USER/dpd/dpd-shardlow/log.reference
	M			examples/USER/dpd/dpdp-shardlow/data.dpd
	M			examples/USER/dpd/dpdp-shardlow/in.dpdp-shardlow
	M			examples/USER/dpd/dpdp-shardlow/log.reference
	M			examples/USER/dpd/dpdrx-shardlow/in.dpdrx
	M			examples/USER/dpd/dpdrx-shardlow/kinetics.dpdrx
	M			examples/USER/dpd/dpdrx-shardlow/params.exp6
	M			examples/USER/dpd/dpdrx-shardlow/table.eos
	M			examples/USER/dpd/dpdrx-shardlow/thermo.dpdrx
	M			examples/USER/dpd/dpdrx-shardlow/thermo.dpdrx.new
	M			lib/colvars/colvar.cpp
	M			lib/colvars/colvar.h
	M			lib/colvars/colvaratoms.cpp
	M			lib/colvars/colvaratoms.h
	M			lib/colvars/colvarbias.cpp
	M			lib/colvars/colvarbias.h
	M			lib/colvars/colvarbias_abf.cpp
	M			lib/colvars/colvarbias_histogram.cpp
	M			lib/colvars/colvarbias_meta.cpp
	M			lib/colvars/colvarbias_meta.h
	M			lib/colvars/colvarbias_restraint.cpp
	M			lib/colvars/colvarbias_restraint.h
	M			lib/colvars/colvarcomp.cpp
	M			lib/colvars/colvarcomp.h
	M			lib/colvars/colvarcomp_angles.cpp
	M			lib/colvars/colvarcomp_coordnums.cpp
	M			lib/colvars/colvarcomp_distances.cpp
	M			lib/colvars/colvarcomp_protein.cpp
	M			lib/colvars/colvarcomp_rotations.cpp
	M			lib/colvars/colvardeps.cpp
	M			lib/colvars/colvardeps.h
	M			lib/colvars/colvargrid.cpp
	M			lib/colvars/colvargrid.h
	M			lib/colvars/colvarmodule.cpp
	M			lib/colvars/colvarmodule.h
	M			lib/colvars/colvarparse.cpp
	M			lib/colvars/colvarparse.h
	M			lib/colvars/colvarproxy.h
	M			lib/colvars/colvarscript.cpp
	M			lib/colvars/colvarscript.h
	M			lib/colvars/colvartypes.h
	M			lib/colvars/colvarvalue.cpp
	M			lib/colvars/colvarvalue.h
	M			lib/gpu/Makefile.fermi
	M			lib/gpu/Makefile.lammps.standard
	M			lib/gpu/Makefile.linux
	M			lib/gpu/geryon/nvd_device.h
	M			lib/gpu/lal_zbl.cpp
	M			src/GRANULAR/pair_gran_hertz_history.cpp
	M			src/GRANULAR/pair_gran_hooke.cpp
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/KOKKOS/neigh_full_kokkos.h
	M			src/KOKKOS/neighbor_kokkos.cpp
	M			src/KOKKOS/neighbor_kokkos.h
	P			src/MAKE/MACHINES/Makefile.beacon Copied to multiple locations: src/MAKE/MINE/Makefile.asan src/MAKE/MINE/Makefile.ubsan
	M			src/MAKE/MACHINES/Makefile.stampede
	P			src/MAKE/MINE/Makefile.asan Copied from src/MAKE/MACHINES/Makefile.beacon
	P			src/MAKE/MINE/Makefile.ubsan Copied from src/MAKE/MACHINES/Makefile.beacon
	M			src/MANYBODY/fix_qeq_comb.cpp
	M			src/MANYBODY/fix_qeq_comb.h
	M			src/MISC/fix_efield.cpp
	M			src/MISC/fix_efield.h
	P			src/MISC/fix_orient_bcc.cpp Copied from src/MISC/fix_orient_fcc.cpp
	P			src/MISC/fix_orient_bcc.h Copied from src/MISC/fix_orient_fcc.h
	P			src/MISC/fix_orient_fcc.cpp Copied to src/MISC/fix_orient_bcc.cpp
	P			src/MISC/fix_orient_fcc.h Copied to src/MISC/fix_orient_bcc.h
	M			src/Make.py
	A			src/RIGID/compute_rigid_local.cpp
	P			src/RIGID/compute_rigid_local.h Copied from src/compute_com_chunk.h
	M			src/RIGID/fix_rattle.cpp
	M			src/RIGID/fix_rattle.h
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid.h
	M			src/RIGID/fix_rigid_nh.cpp
	M			src/RIGID/fix_rigid_nh_small.cpp
	M			src/RIGID/fix_rigid_small.cpp
	M			src/RIGID/fix_rigid_small.h
	M			src/USER-DPD/atom_vec_dpd.cpp
	M			src/USER-DPD/atom_vec_dpd.h
	M			src/USER-DPD/compute_dpd.cpp
	M			src/USER-DPD/compute_dpd.h
	M			src/USER-DPD/compute_dpd_atom.h
	M			src/USER-DPD/fix_eos_cv.cpp
	M			src/USER-DPD/fix_eos_cv.h
	M			src/USER-DPD/fix_eos_table.cpp
	M			src/USER-DPD/fix_eos_table.h
	M			src/USER-DPD/fix_eos_table_rx.cpp
	M			src/USER-DPD/fix_eos_table_rx.h
	M			src/USER-DPD/fix_rx.cpp
	M			src/USER-DPD/fix_rx.h
	M			src/USER-DPD/fix_shardlow.cpp
	M			src/USER-DPD/fix_shardlow.h
	M			src/USER-DPD/pair_dpd_fdt.cpp
	M			src/USER-DPD/pair_dpd_fdt.h
	M			src/USER-DPD/pair_dpd_fdt_energy.cpp
	M			src/USER-DPD/pair_dpd_fdt_energy.h
	M			src/USER-DPD/pair_exp6_rx.cpp
	M			src/USER-DPD/pair_exp6_rx.h
	M			src/USER-DPD/pair_multi_lucy.cpp
	M			src/USER-DPD/pair_multi_lucy.h
	M			src/USER-DPD/pair_multi_lucy_rx.cpp
	M			src/USER-DPD/pair_multi_lucy_rx.h
	M			src/USER-DPD/pair_table_rx.cpp
	M			src/USER-DPD/pair_table_rx.h
	M			src/USER-INTEL/README
	A			src/USER-INTEL/bond_fene_intel.cpp
	P			src/USER-INTEL/bond_fene_intel.h Copied from src/USER-INTEL/improper_cvff_intel.h
	M			src/USER-INTEL/dihedral_charmm_intel.cpp
	M			src/USER-INTEL/improper_cvff_intel.cpp
	P			src/USER-INTEL/improper_cvff_intel.h Copied to src/USER-INTEL/bond_fene_intel.h
	M			src/USER-INTEL/improper_harmonic_intel.cpp
	M			src/USER-INTEL/improper_harmonic_intel.h
	M			src/USER-INTEL/intel_intrinsics.h
	M			src/USER-INTEL/intel_simd.h
	M			src/USER-INTEL/neigh_half_bin_intel.cpp
	M			src/USER-INTEL/pair_lj_cut_intel.cpp
	M			src/USER-MISC/fix_addtorque.cpp
	M			src/USER-MISC/fix_addtorque.h
	M			src/USER-MISC/fix_smd.cpp
	M			src/USER-MISC/fix_smd.h
	M			src/USER-MISC/fix_ttm_mod.cpp
	M			src/USER-MISC/fix_ttm_mod.h
	M			src/USER-OMP/fix_gravity_omp.cpp
	M			src/USER-OMP/fix_qeq_comb_omp.cpp
	M			src/USER-OMP/respa_omp.cpp
	M			src/USER-SMD/fix_smd_setvel.cpp
	M			src/atom.cpp
	M			src/atom.h
	M			src/comm.h
	M			src/comm_brick.cpp
	M			src/comm_brick.h
	M			src/comm_tiled.cpp
	M			src/comm_tiled.h
	M			src/compute.cpp
	M			src/compute.h
	M			src/compute_chunk_atom.cpp
	P			src/compute_com_chunk.h Copied to src/RIGID/compute_rigid_local.h
	M			src/dump_image.cpp
	M			src/fix.cpp
	M			src/fix.h
	M			src/fix_addforce.cpp
	M			src/fix_addforce.h
	M			src/fix_aveforce.cpp
	M			src/fix_aveforce.h
	M			src/fix_drag.cpp
	M			src/fix_drag.h
	M			src/fix_enforce2d.cpp
	M			src/fix_enforce2d.h
	M			src/fix_gravity.cpp
	M			src/fix_gravity.h
	M			src/fix_indent.cpp
	M			src/fix_indent.h
	M			src/fix_nh.cpp
	M			src/fix_property_atom.cpp
	M			src/fix_restrain.cpp
	M			src/fix_restrain.h
	M			src/fix_setforce.cpp
	M			src/fix_setforce.h
	M			src/fix_shear_history.cpp
	M			src/fix_shear_history.h
	M			src/fix_spring.cpp
	P			src/fix_spring.h Copied to src/fix_spring_chunk.h
	A			src/fix_spring_chunk.cpp
	P			src/fix_spring_chunk.h Copied from src/fix_spring.h
	M			src/fix_spring_rg.cpp
	M			src/fix_spring_rg.h
	M			src/fix_spring_self.cpp
	M			src/fix_spring_self.h
	M			src/fix_viscous.cpp
	M			src/fix_viscous.h
	M			src/fix_wall.cpp
	M			src/fix_wall.h
	M			src/fix_wall_region.cpp
	M			src/fix_wall_region.h
	M			src/improper.cpp
	M			src/improper.h
	M			src/improper_hybrid.cpp
	M			src/improper_hybrid.h
	M			src/lammps.cpp
	M			src/lattice.cpp
	M			src/modify.cpp
	M			src/modify.h
	M			src/neigh_gran.cpp
	M			src/neigh_list.cpp
	M			src/neigh_list.h
	M			src/neigh_request.cpp
	M			src/neigh_request.h
	M			src/neigh_shardlow.cpp
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/pair_coul_dsf.cpp
	M			src/random_mars.cpp
	M			src/random_park.cpp
	M			src/read_restart.cpp
	M			src/respa.cpp
	M			src/thermo.cpp
	M			src/thermo.h
	M			src/version.h
	M			test-user-omp/bench_zbl/in.zbl
	A			test/02_commands/in.respa-200
	A			test/02_commands/in.respa-201
	A			test/02_commands/in.respa-202
	M			tools/ch2lmp/README
	M			tools/ch2lmp/charmm2lammps.pl