Diffusion lammps 25092cfc299d

Merge branch 'master' into lammps-icms
25092cfc299d
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 14 2013, 11:57.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 14 2013, 11:57

Pushed

junge

Oct 6 2016, 16:49

Parents

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

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS25092cfc299d: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 14 2013, 11:57

Merged Changes

Commit	Author	Details	Committed
1087ef306e59	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9267 f3b2605a-c512-4ea7…	Jan 12 2013
93e3045cfc38	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9266 f3b2605a-c512-4ea7…	Jan 12 2013
1fbdf607572d	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9265 f3b2605a-c512-4ea7…	Jan 12 2013
2bd231c5637e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9264 f3b2605a-c512-4ea7…	Jan 11 2013
4277a7d8e6e7	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9263 f3b2605a-c512-4ea7…	Jan 11 2013
fafd420f351b	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9262 f3b2605a-c512-4ea7…	Jan 11 2013
a6eb6e4f8486	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9261 f3b2605a-c512-4ea7…	Jan 11 2013
bad59e0fca35	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9260 f3b2605a-c512-4ea7…	Jan 11 2013
37849c807e75	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9259 f3b2605a-c512-4ea7…	Jan 11 2013
e66eccef5f4a	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9258 f3b2605a-c512-4ea7…	Jan 10 2013
20150c50a8dc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9257 f3b2605a-c512-4ea7…	Jan 10 2013
ec624ab44689	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9256 f3b2605a-c512-4ea7…	Jan 9 2013
feefdd97ea5c	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9255 f3b2605a-c512-4ea7…	Jan 9 2013
4fac34ed3e23	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9254 f3b2605a-c512-4ea7…	Jan 9 2013

Changes (26)

				Path
	M			doc/fix_bond_swap.html
	M			doc/fix_bond_swap.txt
	M			doc/fix_heat.html
	M			doc/fix_heat.txt
	M			doc/fix_wall_region.html
	M			doc/fix_wall_region.txt
	M			doc/kspace_style.html
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/pair_lj_long_coul_long.cpp
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid_nh.cpp
	M			src/comm.cpp
	M			src/dump_custom.cpp
	M			src/fix_deform.cpp
	M			src/fix_heat.cpp
	M			src/fix_heat.h
	M			src/fix_langevin.cpp
	M			src/fix_nh.cpp
	M			src/fix_press_berendsen.cpp
	M			src/fix_restrain.cpp
	M			src/fix_temp_berendsen.cpp
	M			src/fix_temp_rescale.cpp
	M			src/fix_tmd.cpp
	M			src/pair_dpd_tstat.cpp
	M			src/variable.cpp
	M			src/version.h