Diffusion lammps 2e8da581f283

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 9 2013, 10:55.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/Makefile
src/kspace.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 9 2013, 10:55

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS6552d599894d: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10999 f3b2605a-c512-4ea7…
rLAMMPSfd58fbac8b16: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2e8da581f283: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 9 2013, 10:55

Merged Changes

Commit	Author	Details	Committed
6552d599894d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10999 f3b2605a-c512-4ea7…	Nov 7 2013
aff07ca26845	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10998 f3b2605a-c512-4ea7…	Nov 7 2013
aeba1923b79b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10997 f3b2605a-c512-4ea7…	Nov 7 2013
28d48bd5d2a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10995 f3b2605a-c512-4ea7…	Nov 7 2013
b2b2a5145a13	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10994 f3b2605a-c512-4ea7…	Nov 7 2013
83534f0802b2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10993 f3b2605a-c512-4ea7…	Nov 7 2013
c3ac2c5be08f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10992 f3b2605a-c512-4ea7…	Nov 7 2013
1cada0b49692	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10991 f3b2605a-c512-4ea7…	Nov 7 2013
bb589062a32b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10990 f3b2605a-c512-4ea7…	Nov 7 2013
5c9784336738	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10989 f3b2605a-c512-4ea7…	Nov 7 2013
cf04ab3943c8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10988 f3b2605a-c512-4ea7…	Nov 7 2013
05649f118942	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10987 f3b2605a-c512-4ea7…	Nov 7 2013
6c76b6562142	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10986 f3b2605a-c512-4ea7…	Nov 7 2013

Changes (88)

		Path
A		doc/Eqs/fix_lb_fluid_boltzmann.jpg
A		doc/Eqs/fix_lb_fluid_boltzmann.tex
A		doc/Eqs/fix_lb_fluid_fluidforce.jpg
A		doc/Eqs/fix_lb_fluid_fluidforce.tex
A		doc/Eqs/fix_lb_fluid_gammadefault.jpg
A		doc/Eqs/fix_lb_fluid_gammadefault.tex
A		doc/Eqs/fix_lb_fluid_navierstokes.jpg
A		doc/Eqs/fix_lb_fluid_navierstokes.tex
A		doc/Eqs/fix_lb_fluid_properties.jpg
A		doc/Eqs/fix_lb_fluid_properties.tex
A		doc/Eqs/fix_lb_fluid_stress.jpg
A		doc/Eqs/fix_lb_fluid_stress.tex
A		doc/Eqs/fix_lb_fluid_viscosity.jpg
A		doc/Eqs/fix_lb_fluid_viscosity.tex
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_packages.html
M		doc/Section_packages.txt
A		doc/fix_lb_fluid.html
A		doc/fix_lb_fluid.txt
A		doc/fix_lb_momentum.html
A		doc/fix_lb_momentum.txt
A		doc/fix_lb_pc.html
A		doc/fix_lb_pc.txt
A		doc/fix_lb_rigid_pc_sphere.html
A		doc/fix_lb_rigid_pc_sphere.txt
A		doc/fix_lb_viscous.html
A		doc/fix_lb_viscous.txt
M		doc/fix_reaxc_species.html
M		doc/fix_reaxc_species.txt
M		doc/minimize.html
M		doc/minimize.txt
M		doc/units.html
M		doc/units.txt
A	(dir)	examples/USER/lb/
A	(dir)	examples/USER/lb/confined_colloid/
A		examples/USER/lb/confined_colloid/in.confined_colloids
A		examples/USER/lb/confined_colloid/results64.out
A	(dir)	examples/USER/lb/dragforce/
A		examples/USER/lb/dragforce/data.one_radius16d2
A		examples/USER/lb/dragforce/defaultgamma_drag.out
A		examples/USER/lb/dragforce/in.defaultgamma_drag
A		examples/USER/lb/dragforce/in.setgamma_drag
A		examples/USER/lb/dragforce/setgamma13d0_drag.out
A	(dir)	examples/USER/lb/fourspheres/
A		examples/USER/lb/fourspheres/data.four
A		examples/USER/lb/fourspheres/fourspheres_velocity0d0001_defaultgamma.out
A		examples/USER/lb/fourspheres/fourspheres_velocity0d0001_setgamma.out
A		examples/USER/lb/fourspheres/in.fourspheres_default_gamma
A		examples/USER/lb/fourspheres/in.fourspheres_set_gamma
A	(dir)	examples/USER/lb/microrheology/
A		examples/USER/lb/microrheology/data.two
A		examples/USER/lb/microrheology/in.microrheology_default_gamma
A		examples/USER/lb/microrheology/in.microrheology_set_gamma
A		examples/USER/lb/microrheology/microrheology_defaultgamma.out
A		examples/USER/lb/microrheology/microrheology_setgamma.out
A	(dir)	examples/USER/lb/planewall/
A		examples/USER/lb/planewall/data.one_radius16d2
A		examples/USER/lb/planewall/in.planewall_default_gamma
A		examples/USER/lb/planewall/in.planewall_set_gamma
A		examples/USER/lb/planewall/wall_defaultgamma.out
A		examples/USER/lb/planewall/wall_setgamma.out
A	(dir)	examples/USER/lb/polymer/
A		examples/USER/lb/polymer/data.polymer
A		examples/USER/lb/polymer/in.polymer
A		examples/USER/lb/polymer/out.polymer
M		src/Makefile
A	(dir)	src/USER-LB/
A		src/USER-LB/README
A		src/USER-LB/fix_lb_fluid.cpp
A		src/USER-LB/fix_lb_fluid.h
A		src/USER-LB/fix_lb_momentum.cpp
A		src/USER-LB/fix_lb_momentum.h
A		src/USER-LB/fix_lb_pc.cpp
A		src/USER-LB/fix_lb_pc.h
A		src/USER-LB/fix_lb_rigid_pc_sphere.cpp
A		src/USER-LB/fix_lb_rigid_pc_sphere.h
A		src/USER-LB/fix_lb_viscous.cpp
A		src/USER-LB/fix_lb_viscous.h
M		src/USER-MISC/fix_ti_rs.cpp
M		src/USER-MISC/fix_ti_rs.h
M		src/USER-MISC/fix_ti_spring.cpp
M		src/USER-MISC/fix_ti_spring.h
M		src/kspace.h
M		src/update.cpp
M		src/version.h