Diffusion lammps 4c611fb1d0cb

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

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

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 8 2016, 12:29

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS6709e70d18c1: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15154 f3b2605a-c512-4ea7…
rLAMMPS3103b9824784: fix a typo and clear up some wording as mentioned in PR #80

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
6709e70d18c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15154 f3b2605a-c512-4ea7…	Jun 7 2016
d84b73a6b036	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15153 f3b2605a-c512-4ea7…	Jun 7 2016
3497d6382cd2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15151 f3b2605a-c512-4ea7…	Jun 7 2016
ab7e896a76db	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15150 f3b2605a-c512-4ea7…	Jun 7 2016
0129ff9696c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15149 f3b2605a-c512-4ea7…	Jun 7 2016
b5abf9342bc2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15148 f3b2605a-c512-4ea7…	Jun 7 2016
0288bdba408d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15147 f3b2605a-c512-4ea7…	Jun 7 2016
2f225bbc3a6b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15146 f3b2605a-c512-4ea7…	Jun 7 2016
f3d5260813c9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15145 f3b2605a-c512-4ea7…	Jun 7 2016
a5fef35ebd99	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15144 f3b2605a-c512-4ea7…	Jun 7 2016
b107958e8097	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15143 f3b2605a-c512-4ea7…	Jun 7 2016
7a51ae13118e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15142 f3b2605a-c512-4ea7…	Jun 7 2016
214e8876c01f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15141 f3b2605a-c512-4ea7…	Jun 7 2016
8b17319fceb5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15140 f3b2605a-c512-4ea7…	Jun 7 2016
84514d345b69	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15139 f3b2605a-c512-4ea7…	Jun 7 2016
c3f0833b48ef	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15138 f3b2605a-c512-4ea7…	Jun 7 2016
8a7fb8e7e03a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15137 f3b2605a-c512-4ea7…	Jun 7 2016
1afe415c079e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15135 f3b2605a-c512-4ea7…	Jun 7 2016
c8c29cb08459	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15134 f3b2605a-c512-4ea7…	Jun 7 2016
27d7c598bf7a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15133 f3b2605a-c512-4ea7…	Jun 7 2016
9c5655db7c48	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15130 f3b2605a-c512-4ea7…	Jun 7 2016
d1428accee11	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15129 f3b2605a-c512-4ea7…	Jun 7 2016
0f5dcedee106	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15128 f3b2605a-c512-4ea7…	Jun 7 2016
78c0df7de297	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15127 f3b2605a-c512-4ea7…	Jun 7 2016
22fe6d52902e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15126 f3b2605a-c512-4ea7…	Jun 7 2016
a8ae4fa419cc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15125 f3b2605a-c512-4ea7…	Jun 7 2016
7c55da3879cf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15124 f3b2605a-c512-4ea7…	Jun 7 2016
63c80930f1ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15123 f3b2605a-c512-4ea7…	Jun 7 2016
946de18d47be	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15122 f3b2605a-c512-4ea7…	Jun 7 2016
59497c1076c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15121 f3b2605a-c512-4ea7…	Jun 7 2016
7cb2b01ebd97	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15120 f3b2605a-c512-4ea7…	Jun 7 2016
9fbe66667723	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15119 f3b2605a-c512-4ea7…	Jun 7 2016
2927a9aee1f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15118 f3b2605a-c512-4ea7…	Jun 7 2016
97ae23af75e5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15117 f3b2605a-c512-4ea7…	Jun 7 2016
78c5aafccf4f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15116 f3b2605a-c512-4ea7…	Jun 7 2016
930e2aa033ee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15115 f3b2605a-c512-4ea7…	Jun 7 2016

Changes (154)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		doc/html/Manual.html
M		doc/html/Section_commands.html
M		doc/html/Section_packages.html
M		doc/html/Section_perf.html
M		doc/html/_images/compute_dpd.jpg
A		doc/html/_images/fix_ehex_eom.jpg
A		doc/html/_images/fix_ehex_f.jpg
A		doc/html/_images/fix_eos_table_rx.jpg
A		doc/html/_images/fix_rx.jpg
A		doc/html/_images/fix_rx_localTemp.jpg
A		doc/html/_images/fix_rx_localTemp2.jpg
A		doc/html/_images/fix_rx_reaction.jpg
A		doc/html/_images/fix_rx_reactionRate.jpg
A		doc/html/_images/pair_exp6_rx.jpg
A		doc/html/_images/pair_exp6_rx_oneFluid.jpg
A		doc/html/_images/pair_exp6_rx_oneFluid2.jpg
M		doc/html/_images/pair_multi_lucy.jpg
M		doc/html/_images/pair_multi_lucy2.jpg
M		doc/html/_images/pair_multi_lucy_energy.jpg
M		doc/html/_sources/Manual.txt
M		doc/html/_sources/Section_commands.txt
M		doc/html/_sources/Section_intro.txt
M		doc/html/_sources/Section_packages.txt
M		doc/html/_sources/Section_perf.txt
M		doc/html/_sources/atom_style.txt
M		doc/html/_sources/bond_write.txt
M		doc/html/_sources/compute_dpd.txt
M		doc/html/_sources/compute_dpd_atom.txt
M		doc/html/_sources/dihedral_harmonic.txt
M		doc/html/_sources/dump_image.txt
M		doc/html/_sources/fix.txt
M		doc/html/_sources/fix_ehex.txt
M		doc/html/_sources/fix_eos_cv.txt
M		doc/html/_sources/fix_eos_table.txt
A		doc/html/_sources/fix_eos_table_rx.txt
M		doc/html/_sources/fix_gle.txt
A		doc/html/_sources/fix_rx.txt
M		doc/html/_sources/fix_shardlow.txt
M		doc/html/_sources/pair_dpd_fdt.txt
A		doc/html/_sources/pair_exp6_rx.txt
M		doc/html/_sources/pair_multi_lucy.txt
A		doc/html/_sources/pair_multi_lucy_rx.txt
A		doc/html/_sources/pair_table_rx.txt
M		doc/html/_sources/set.txt
M		doc/html/_sources/suffix.txt
M		doc/html/atom_style.html
M		doc/html/compute_dpd.html
M		doc/html/compute_dpd_atom.html
M		doc/html/fix.html
M		doc/html/fix_ehex.html
M		doc/html/fix_eos_cv.html
P		doc/html/fix_eos_table.html Copied to doc/html/fix_eos_table_rx.html
P		doc/html/fix_eos_table_rx.html Copied from doc/html/fix_eos_table.html
A		doc/html/fix_rx.html
M		doc/html/fix_shardlow.html
M		doc/html/genindex.html
M		doc/html/pair_dpd_fdt.html
A		doc/html/pair_exp6_rx.html
M		doc/html/pair_modify.html
P		doc/html/pair_multi_lucy.html Copied to doc/html/pair_multi_lucy_rx.html
P		doc/html/pair_multi_lucy_rx.html Copied from doc/html/pair_multi_lucy.html
P		doc/html/pair_table.html Copied to doc/html/pair_table_rx.html
P		doc/html/pair_table_rx.html Copied from doc/html/pair_table.html
M		doc/html/searchindex.js
M		doc/html/set.html
M		doc/src/Eqs/compute_dpd.jpg
M		doc/src/Eqs/compute_dpd.tex
A		doc/src/Eqs/fix_ehex_eom.jpg
A		doc/src/Eqs/fix_ehex_eom.tex
A		doc/src/Eqs/fix_ehex_f.jpg
A		doc/src/Eqs/fix_ehex_f.tex
A		doc/src/Eqs/fix_eos_table_rx.jpg
A		doc/src/Eqs/fix_eos_table_rx.tex
A		doc/src/Eqs/fix_rx.jpg
A		doc/src/Eqs/fix_rx.tex
A		doc/src/Eqs/fix_rx_localTemp.jpg
A		doc/src/Eqs/fix_rx_localTemp.tex
A		doc/src/Eqs/fix_rx_localTemp2.jpg
A		doc/src/Eqs/fix_rx_localTemp2.tex
A		doc/src/Eqs/fix_rx_reaction.jpg
A		doc/src/Eqs/fix_rx_reaction.tex
A		doc/src/Eqs/fix_rx_reactionRate.jpg
A		doc/src/Eqs/fix_rx_reactionRate.tex
A		doc/src/Eqs/pair_exp6_rx.jpg
A		doc/src/Eqs/pair_exp6_rx.tex
A		doc/src/Eqs/pair_exp6_rx_oneFluid.jpg
A		doc/src/Eqs/pair_exp6_rx_oneFluid.tex
A		doc/src/Eqs/pair_exp6_rx_oneFluid2.jpg
A		doc/src/Eqs/pair_exp6_rx_oneFluid2.tex
M		doc/src/Eqs/pair_multi_lucy.jpg
M		doc/src/Eqs/pair_multi_lucy2.jpg
M		doc/src/Eqs/pair_multi_lucy_energy.jpg
M		doc/src/Manual.txt
M		doc/src/Section_commands.txt
M		doc/src/Section_packages.txt
M		doc/src/atom_style.txt
M		doc/src/compute_dpd.txt
M		doc/src/compute_dpd_atom.txt
M		doc/src/fix.txt
M		doc/src/fix_ehex.txt
M		doc/src/fix_eos_cv.txt
M		doc/src/fix_eos_table.txt
A		doc/src/fix_eos_table_rx.txt
A		doc/src/fix_rx.txt
M		doc/src/fix_shardlow.txt
M		doc/src/pair_dpd_fdt.txt
A		doc/src/pair_exp6_rx.txt
M		doc/src/pair_multi_lucy.txt
A		doc/src/pair_multi_lucy_rx.txt
A		doc/src/pair_table_rx.txt
M		doc/src/set.txt
A		examples/HEAT/README
M		examples/KAPPA/README
A		examples/KAPPA/in.ehex
A		examples/KAPPA/log.ehex.7Jun16
D		examples/KAPPA/log.heat.1Feb14
A		examples/KAPPA/log.heat.7Jun16
A		examples/KAPPA/profile.ehex.7Jun16
D		examples/KAPPA/profile.heat.1Feb14
A		examples/KAPPA/profile.heat.7Jun16
M		examples/README
M		examples/USER/dpd/README
A	(dir)	examples/USER/dpd/dpdrx-shardlow/
A		examples/USER/dpd/dpdrx-shardlow/in.dpdrx
A		examples/USER/dpd/dpdrx-shardlow/kinetics.dpdrx
A		examples/USER/dpd/dpdrx-shardlow/params.exp6
A		examples/USER/dpd/dpdrx-shardlow/table.eos
A		examples/USER/dpd/dpdrx-shardlow/thermo.dpdrx
A		examples/USER/dpd/dpdrx-shardlow/thermo.dpdrx.new
M		src/ASPHERE/fix_nph_asphere.cpp
A		src/RIGID/fix_ehex.cpp
A		src/RIGID/fix_ehex.h
M		src/RIGID/fix_rattle.cpp
M		src/RIGID/fix_rattle.h
M		src/RIGID/fix_shake.cpp
M		src/RIGID/fix_shake.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_atom.cpp
A		src/USER-DPD/fix_eos_table_rx.cpp
A		src/USER-DPD/fix_eos_table_rx.h
A		src/USER-DPD/fix_rx.cpp
A		src/USER-DPD/fix_rx.h
A		src/USER-DPD/pair_exp6_rx.cpp
A		src/USER-DPD/pair_exp6_rx.h
A		src/USER-DPD/pair_multi_lucy_rx.cpp
A		src/USER-DPD/pair_multi_lucy_rx.h
A		src/USER-DPD/pair_table_rx.cpp
A		src/USER-DPD/pair_table_rx.h
M		src/fix_nh.h
M		src/modify.cpp
M		src/set.cpp
M		src/version.h