Diffusion lammps 0e2971340280

Merge branch 'master' into lammps-icms
0e2971340280
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 4 2011, 17:34.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 4 2011, 17:34

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS80b1bf465217: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5453 f3b2605a-c512-4ea7…
rLAMMPS178b58f7a526: undo previous commits to irregular.cpp

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS0e2971340280: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 4 2011, 17:34

Merged Changes

Commit	Author	Details	Committed
80b1bf465217	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5453 f3b2605a-c512-4ea7…	Jan 4 2011
d82f4c346098	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5452 f3b2605a-c512-4ea7…	Jan 4 2011
c0ca611a19e2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5451 f3b2605a-c512-4ea7…	Jan 3 2011
80a03a695f0a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5450 f3b2605a-c512-4ea7…	Jan 3 2011
1e987169f171	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5448 f3b2605a-c512-4ea7…	Jan 3 2011
df61f4f56877	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5447 f3b2605a-c512-4ea7…	Jan 3 2011
435961998564	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5444 f3b2605a-c512-4ea7…	Jan 3 2011
857952521eab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5443 f3b2605a-c512-4ea7…	Jan 3 2011
7a2ad8387643	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5442 f3b2605a-c512-4ea7…	Jan 3 2011
cf905573f813	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5441 f3b2605a-c512-4ea7…	Jan 3 2011
203b6e32d24a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5440 f3b2605a-c512-4ea7…	Jan 3 2011
d4769d99a324	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5439 f3b2605a-c512-4ea7…	Jan 3 2011
c49be34d064d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5438 f3b2605a-c512-4ea7…	Dec 23 2010
5004f6d79741	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5435 f3b2605a-c512-4ea7…	Dec 23 2010
b145d7f4d632	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5434 f3b2605a-c512-4ea7…	Dec 23 2010
bd1c701a6d10	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5433 f3b2605a-c512-4ea7…	Dec 23 2010
47309e66e6c2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5432 f3b2605a-c512-4ea7…	Dec 23 2010
f4487dd73127	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5431 f3b2605a-c512-4ea7…	Dec 23 2010
50cab4a471d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5429 f3b2605a-c512-4ea7…	Dec 23 2010
5cbd27cdf61d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5428 f3b2605a-c512-4ea7…	Dec 23 2010

Changes (36)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/compute_heat_flux.html
	M			doc/compute_heat_flux.txt
	M			doc/fix_addforce.html
	M			doc/fix_addforce.txt
	M			doc/fix_thermal_conductivity.html
	M			doc/fix_thermal_conductivity.txt
	M			doc/minimize.html
	M			doc/minimize.txt
	M			doc/pair_charmm.html
	M			doc/pair_charmm.txt
	M			doc/pair_reax_c.html
	M			doc/pair_reax_c.txt
	M			src/KSPACE/pair_lj_charmm_coul_long.cpp
	M			src/MOLECULE/pair_lj_charmm_coul_charmm.cpp
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/USER-REAXC/pair_reax_c.h
	M			src/compute_reduce_region.cpp
	M			src/compute_ti.cpp
	M			src/fix_addforce.cpp
	M			src/fix_ave_atom.cpp
	M			src/fix_ave_atom.h
	M			src/fix_ave_correlate.cpp
	M			src/fix_ave_correlate.h
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_histo.h
	M			src/fix_ave_spatial.cpp
	M			src/fix_ave_spatial.h
	M			src/fix_ave_time.cpp
	M			src/fix_ave_time.h
	M			src/min_fire.cpp
	M			src/min_quickmin.cpp
	M			src/version.h