Diffusion lammps 1dcf6eb192f2

lammps…
1dcf6eb192f2
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 18 2016, 20:21.

Description

Merge branch 'improved_python_interface' of https://github.com/rbberger/lammps into merge-pull-116

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 18 2016, 20:21

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS10d27f75e375: Merge remote-tracking branch 'upstream/lammps-icms' into…
rLAMMPS3e5474d91374: Merge branch 'improved_python_interface' of https://github.com/rbberger/lammps…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1dcf6eb192f2: Merge branch 'improved_python_interface' of https://github.com/rbberger/lammps… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 18 2016, 20:21

Merged Changes

Commit	Author	Details	Committed
10d27f75e375	Richard Berger	Merge remote-tracking branch 'upstream/lammps-icms' into…	Jul 18 2016
45204726d881	Richard Berger	Revert to 2 spaces for Steve	Jul 18 2016
5519b38bd9ba	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jul 17 2016
a360b605f087	Axel Kohlmeyer	explain workaround for replicate restrictions with fixes	Jul 17 2016
0ec028d9f26f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15339 f3b2605a-c512-4ea7…	Jul 17 2016
778ae37e6e53	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15338 f3b2605a-c512-4ea7…	Jul 17 2016
1111c8ba93c9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15337 f3b2605a-c512-4ea7…	Jul 17 2016
a6f62209af65	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15336 f3b2605a-c512-4ea7…	Jul 17 2016
89b839056c0e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15335 f3b2605a-c512-4ea7…	Jul 17 2016
596d6840a5eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15334 f3b2605a-c512-4ea7…	Jul 17 2016
a5b6dbea786f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15333 f3b2605a-c512-4ea7…	Jul 16 2016
1c084bc4e517	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jul 16 2016
d53616b6c837	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15331 f3b2605a-c512-4ea7…	Jul 16 2016
4bf96ac144ec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15330 f3b2605a-c512-4ea7…	Jul 16 2016
ea3984356441	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15329 f3b2605a-c512-4ea7…	Jul 16 2016
472fe29a8997	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15328 f3b2605a-c512-4ea7…	Jul 16 2016
e6dc896b4979	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15327 f3b2605a-c512-4ea7…	Jul 16 2016
80fce623ec65	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15326 f3b2605a-c512-4ea7…	Jul 16 2016
a47e457ab0c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15325 f3b2605a-c512-4ea7…	Jul 16 2016
a2782baa64a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15324 f3b2605a-c512-4ea7…	Jul 16 2016
2705ddcaab9c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15323 f3b2605a-c512-4ea7…	Jul 16 2016
638b0db5359e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15322 f3b2605a-c512-4ea7…	Jul 16 2016
8a4dc62d2c15	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15321 f3b2605a-c512-4ea7…	Jul 16 2016
c79a24c7ef7a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15320 f3b2605a-c512-4ea7…	Jul 16 2016
12f3178e868d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15319 f3b2605a-c512-4ea7…	Jul 16 2016
eb78022b5a1a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15318 f3b2605a-c512-4ea7…	Jul 16 2016
10bbb289435b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15317 f3b2605a-c512-4ea7…	Jul 16 2016
1587bdf2f1b2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15316 f3b2605a-c512-4ea7…	Jul 16 2016
05398a68637a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15315 f3b2605a-c512-4ea7…	Jul 16 2016
d32f1ea4c0df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15314 f3b2605a-c512-4ea7…	Jul 15 2016
e85587d25eca	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jul 15 2016
6925bfb2d4c9	Axel Kohlmeyer	Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…	Jul 15 2016
85599812c491	Axel Kohlmeyer	Merge branch 'pure_locals_plus_ndxAIR_ssa' of https://github.	Jul 14 2016
fbf361e478ce	Tim Mattox	USER-DPD: Process each AIR in the SSA without scanning the NeighList. Sorts…	Jul 14 2016
691cb955068b	Tim Mattox	Save build time since only non-pure locals can have ghost neighbors.	Jul 14 2016
f17037c61079	Tim Mattox	USER-DPD: Track pure locals as AIR #0, and non-pure locals as AIR #1 Non-pure…	Jul 14 2016
ced05989ca34	Axel Kohlmeyer	change python module formatting according to python guidelines and fix a couple…	Jul 14 2016
b59911779f14	Axel Kohlmeyer	adapt info output for easier parsing	Jul 14 2016
d326e8a767d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15313 f3b2605a-c512-4ea7…	Jul 14 2016
b399e2e496d4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15312 f3b2605a-c512-4ea7…	Jul 14 2016
7d2809dd09b5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15311 f3b2605a-c512-4ea7…	Jul 14 2016
4e76c2da5338	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15310 f3b2605a-c512-4ea7…	Jul 14 2016
2f09c2755ae1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15309 f3b2605a-c512-4ea7…	Jul 14 2016
422062a34006	Axel Kohlmeyer	fix typo	Jul 14 2016

Changes (62)

				Path
	M			doc/html/Manual.html
	M			doc/html/PDF/colvars-refman-lammps.pdf
	M			doc/html/Section_commands.html
	M			doc/html/_images/dihedral_sign.jpg
	A			doc/html/_images/dihedral_spherical.jpg
	A			doc/html/_images/dihedral_spherical_angles.jpg
	M			doc/html/_sources/Manual.txt
	M			doc/html/_sources/Section_commands.txt
	A			doc/html/_sources/dihedral_spherical.txt
	M			doc/html/_sources/dihedral_style.txt
	M			doc/html/_sources/dump_image.txt
	M			doc/html/_sources/fix_addforce.txt
	M			doc/html/_sources/fix_aveforce.txt
	M			doc/html/_sources/fix_deposit.txt
	M			doc/html/_sources/fix_enforce2d.txt
	M			doc/html/_sources/fix_freeze.txt
	M			doc/html/_sources/fix_shake.txt
	M			doc/html/_sources/pair_brownian.txt
	M			doc/html/_sources/replicate.txt
	P			doc/html/dihedral_spherical.html Copied from doc/html/fix_freeze.html
	M			doc/html/dump_image.html
	M			doc/html/fix_addforce.html
	M			doc/html/fix_aveforce.html
	M			doc/html/fix_deposit.html
	M			doc/html/fix_enforce2d.html
	P			doc/html/fix_freeze.html Copied to doc/html/dihedral_spherical.html
	M			doc/html/fix_shake.html
	M			doc/html/genindex.html
	M			doc/html/pair_brownian.html
	M			doc/html/replicate.html
	M			doc/html/searchindex.js
	M			doc/src/Manual.txt
	M			doc/src/Section_commands.txt
	M			doc/src/dump_image.txt
	M			doc/src/pair_brownian.txt
	M			doc/src/replicate.txt
	M			lib/qmmm/README
	M			python/lammps.py
	M			src/BODY/body_nparticle.cpp
	M			src/GRANULAR/fix_wall_gran.cpp
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/USER-DPD/fix_shardlow.cpp
	M			src/USER-DPD/fix_shardlow.h
	M			src/USER-MISC/README
	M			src/USER-OMP/fix_shear_history_omp.cpp
	M			src/USER-OMP/neigh_gran_omp.cpp
	M			src/compute.cpp
	M			src/dump_image.cpp
	M			src/dump_image.h
	M			src/fix.h
	M			src/fix_move.cpp
	M			src/fix_shear_history.cpp
	M			src/fix_shear_history.h
	M			src/modify.cpp
	M			src/modify.h
	M			src/neigh_derive.cpp
	M			src/neigh_gran.cpp
	M			src/neigh_list.cpp
	M			src/neigh_list.h
	M			src/neigh_shardlow.cpp
	M			src/neighbor.cpp
	M			src/version.h