Diffusion lammps 28a9a22aa614

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 18 2016, 12:22.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 18 2016, 12:22

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS4569c3876ca4: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15207 f3b2605a-c512-4ea7…
rLAMMPSe14cdede6390: mention in the individual fix documentation, if it supports fix_modify respa

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS28a9a22aa614: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 18 2016, 12:22

Merged Changes

Commit	Author	Details	Committed
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

Changes (110)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/html/Manual.html
	M			doc/html/PDF/colvars-refman-lammps.pdf
	M			doc/html/Section_commands.html
	M			doc/html/_sources/Manual.txt
	M			doc/html/_sources/Section_commands.txt
	M			doc/html/_sources/accelerate_gpu.txt
	M			doc/html/_sources/compute.txt
	A			doc/html/_sources/compute_rigid_local.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_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
	M			doc/html/_sources/fix_orient.txt
	M			doc/html/_sources/fix_qeq_comb.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
	M			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/pair_dpd_fdt.txt
	M			doc/html/_sources/pair_gran.txt
	M			doc/html/_sources/run_style.txt
	M			doc/html/_sources/timer.txt
	M			doc/html/accelerate_gpu.html
	M			doc/html/compute.html
	A			doc/html/compute_rigid_local.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_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
	M			doc/html/fix_orient.html
	M			doc/html/fix_qeq_comb.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
	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_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/run_style.html
	M			doc/html/searchindex.js
	M			doc/html/timer.html
	M			doc/src/Manual.txt
	M			doc/src/Section_commands.txt
	M			doc/src/compute.txt
	A			doc/src/compute_rigid_local.txt
	M			doc/src/fix_addforce.txt
	M			doc/src/fix_aveforce.txt
	M			doc/src/fix_enforce2d.txt
	M			doc/src/fix_freeze.txt
	M			doc/src/fix_modify.txt
	M			doc/src/fix_rigid.txt
	M			doc/src/fix_shake.txt
	M			doc/src/pair_gran.txt
	M			doc/src/timer.txt
	M			src/GRANULAR/pair_gran_hertz_history.cpp
	M			src/GRANULAR/pair_gran_hooke.cpp
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	A			src/RIGID/compute_rigid_local.cpp
	P			src/RIGID/compute_rigid_local.h Copied from src/fix_enforce2d.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/comm.h
	M			src/comm_brick.cpp
	M			src/comm_brick.h
	M			src/comm_tiled.cpp
	M			src/comm_tiled.h
	M			src/fix.cpp
	M			src/fix.h
	M			src/fix_enforce2d.cpp
	P			src/fix_enforce2d.h Copied to src/RIGID/compute_rigid_local.h
	M			src/fix_property_atom.cpp
	M			src/fix_shear_history.cpp
	M			src/fix_shear_history.h
	M			src/neigh_gran.cpp
	M			src/version.h