Diffusion lammps d80c13054b7b

Merge branch 'master' into lammps-icms
d80c13054b7b
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 20 2010, 15:31.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 20 2010, 15:31

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS52070e6fcedd: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4543 f3b2605a-c512-4ea7…
rLAMMPSe6ae9ce6c2fa: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd80c13054b7b: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 20 2010, 15:31

Merged Changes

Commit	Author	Details	Committed
52070e6fcedd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4543 f3b2605a-c512-4ea7…	Aug 20 2010
123ad547e1c6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4542 f3b2605a-c512-4ea7…	Aug 20 2010
fd1e84f5bb29	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4541 f3b2605a-c512-4ea7…	Aug 20 2010
7992f3ce7db6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4540 f3b2605a-c512-4ea7…	Aug 20 2010
bc094303c0b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4538 f3b2605a-c512-4ea7…	Aug 20 2010
b59bf9bac558	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4536 f3b2605a-c512-4ea7…	Aug 20 2010
f14685723976	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4535 f3b2605a-c512-4ea7…	Aug 20 2010
3b4e7309fa43	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4534 f3b2605a-c512-4ea7…	Aug 20 2010
be9708e36533	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4532 f3b2605a-c512-4ea7…	Aug 20 2010
598fd60526df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4531 f3b2605a-c512-4ea7…	Aug 20 2010
b073cf8920e7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4530 f3b2605a-c512-4ea7…	Aug 20 2010
5ec279db0100	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4529 f3b2605a-c512-4ea7…	Aug 20 2010
f4f39a21d8d8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4528 f3b2605a-c512-4ea7…	Aug 20 2010
41d9b859e4e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4526 f3b2605a-c512-4ea7…	Aug 19 2010
92209c7adf1a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4515 f3b2605a-c512-4ea7…	Aug 19 2010
45e8600b0d68	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4513 f3b2605a-c512-4ea7…	Aug 19 2010
d4eacc3728c2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4512 f3b2605a-c512-4ea7…	Aug 19 2010
17979639a31e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4510 f3b2605a-c512-4ea7…	Aug 19 2010
f9cffa4e0cd0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4509 f3b2605a-c512-4ea7…	Aug 19 2010
0f6a4b8ed31b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4508 f3b2605a-c512-4ea7…	Aug 19 2010
321736286adc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4507 f3b2605a-c512-4ea7…	Aug 19 2010
2beb8d3ebde2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4506 f3b2605a-c512-4ea7…	Aug 19 2010
5ff00cfd0f2a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4505 f3b2605a-c512-4ea7…	Aug 19 2010
ad1adc6474f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4504 f3b2605a-c512-4ea7…	Aug 19 2010
c85e34a881cc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4503 f3b2605a-c512-4ea7…	Aug 19 2010

Changes (79)

		Path
A		doc/Eqs/pair_comb_1.jpg
A		doc/Eqs/pair_comb_2.jpg
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_intro.html
M		doc/Section_intro.txt
M		doc/compute_heat_flux.html
M		doc/compute_heat_flux.txt
M		doc/fix_ave_correlate.html
M		doc/fix_ave_correlate.txt
A		doc/fix_qeq_comb.html
A		doc/fix_qeq_comb.txt
M		doc/fix_rigid.html
M		doc/fix_rigid.txt
A		doc/pair_comb.html
A		doc/pair_comb.txt
M		doc/pair_soft.html
M		doc/pair_soft.txt
M		doc/region.html
M		doc/region.txt
M		examples/README
A	(dir)	examples/comb/
A		examples/comb/README.txt
A		examples/comb/data.Cu2O
A		examples/comb/data.c-HfO2
A		examples/comb/data.m-HfO2
A		examples/comb/data.t-HfO2
A		examples/comb/elastic.f90
A		examples/comb/ffield.comb
A		examples/comb/in.comb.Cu
A		examples/comb/in.comb.Cu2O.elastic
A		examples/comb/in.comb.HfO2
A		examples/comb/in.comb.Si
A		examples/comb/in.comb.Si.elastic
A		examples/comb/log.comb.Cu.15Jan10.linux.1
A		examples/comb/log.comb.Cu.15Jan10.linux.4
A		examples/comb/log.comb.Cu2O.elastic.linux.1
A		examples/comb/log.comb.Cu2O.elastic.linux.4
A		examples/comb/log.comb.HfO2.15Jan10.linux.1
A		examples/comb/log.comb.HfO2.15Jan10.linux.4
A		examples/comb/log.comb.Si.15Jan10.linux.1
A		examples/comb/log.comb.Si.15Jan10.linux.4
A		examples/comb/log.comb.Si.elastic.15Jan10.linux.1
A		examples/comb/log.comb.Si.elastic.15Jan10.linux.4
M		src/MANYBODY/Install.sh
A		src/MANYBODY/fix_qeq_comb.cpp
P		src/MANYBODY/fix_qeq_comb.h Copied from src/fix_store_force.h
A		src/MANYBODY/pair_comb.cpp
A		src/MANYBODY/pair_comb.h
M		src/compute_reduce.cpp
M		src/compute_reduce.h
M		src/compute_temp_region.cpp
M		src/compute_temp_region.h
M		src/domain.cpp
M		src/domain.h
M		src/dump_cfg.cpp
M		src/dump_custom.cpp
M		src/dump_custom.h
M		src/finish.cpp
M		src/fix_addforce.cpp
M		src/fix_addforce.h
M		src/fix_ave_correlate.cpp
M		src/fix_aveforce.cpp
M		src/fix_aveforce.h
M		src/fix_deposit.cpp
M		src/fix_deposit.h
M		src/fix_evaporate.cpp
M		src/fix_evaporate.h
M		src/fix_heat.cpp
M		src/fix_heat.h
M		src/fix_setforce.cpp
M		src/fix_setforce.h
M		src/fix_wall_region.cpp
M		src/fix_wall_region.h
M		src/respa.cpp
M		src/update.cpp
M		src/update.h
M		src/verlet.cpp
M		src/version.h