Diffusion lammps deeea254b1f0

Merge branch 'lammps-icms' into lammps-colvars
deeea254b1f0
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 23 2013, 12:01.

Description

Merge branch 'lammps-icms' into lammps-colvars

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 23 2013, 12:01

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS625f81e5dbb2: Merge branch 'master' into lammps-icms
rLAMMPS436f9457232b: Merge branch 'lammps-icms' into lammps-colvars

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSdeeea254b1f0: Merge branch 'lammps-icms' into lammps-colvars (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 23 2013, 12:01

Merged Changes

Commit	Author	Details	Committed
625f81e5dbb2	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Jan 23 2013
7930d8b34f8d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9306 f3b2605a-c512-4ea7…	Jan 21 2013
5b1fe9d76389	Axel Kohlmeyer	update /omp versions of brownian and lubricate pair styles for changes in…	Jan 21 2013
af8189610001	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Jan 21 2013
fd75622da330	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9303 f3b2605a-c512-4ea7…	Jan 18 2013
6efc2340659c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9302 f3b2605a-c512-4ea7…	Jan 18 2013
35769609d95c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9301 f3b2605a-c512-4ea7…	Jan 18 2013
746deead15bf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9300 f3b2605a-c512-4ea7…	Jan 18 2013
2d6d2de507ff	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9299 f3b2605a-c512-4ea7…	Jan 18 2013
aa62e9b38983	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9297 f3b2605a-c512-4ea7…	Jan 18 2013
580cecfd0971	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9296 f3b2605a-c512-4ea7…	Jan 18 2013
7866cd6a293b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9295 f3b2605a-c512-4ea7…	Jan 18 2013
43e422a6833f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9294 f3b2605a-c512-4ea7…	Jan 18 2013
bbb9f5d88e2c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9293 f3b2605a-c512-4ea7…	Jan 18 2013

Changes (49)

		Path
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_tools.html
M		doc/Section_tools.txt
M		doc/fix_adapt.html
M		doc/fix_adapt.txt
M		doc/fix_wall.html
M		doc/fix_wall.txt
M		doc/kspace_style.html
M		doc/kspace_style.txt
M		doc/pair_born.html
M		doc/pair_born.txt
M		doc/pair_buck.html
M		doc/pair_buck.txt
M		doc/pair_charmm.html
M		doc/pair_charmm.txt
M		doc/pair_coul.html
M		doc/pair_coul.txt
M		doc/pair_lj.html
M		doc/pair_lj.txt
M		doc/region.html
M		doc/region.txt
M		src/FLD/pair_brownian.cpp
M		src/FLD/pair_brownian_poly.cpp
M		src/FLD/pair_lubricate.cpp
M		src/FLD/pair_lubricateU.cpp
M		src/FLD/pair_lubricateU_poly.cpp
M		src/FLD/pair_lubricate_poly.cpp
M		src/USER-OMP/pair_brownian_omp.cpp
M		src/USER-OMP/pair_brownian_poly_omp.cpp
M		src/USER-OMP/pair_lubricate_omp.cpp
M		src/USER-OMP/pair_lubricate_poly_omp.cpp
M		src/fix_wall.cpp
M		src/fix_wall.h
M		src/region.cpp
M		src/region.h
M		src/region_cylinder.cpp
M		src/region_cylinder.h
M		src/region_intersect.cpp
M		src/region_intersect.h
M		src/region_sphere.cpp
M		src/region_sphere.h
M		src/region_union.cpp
M		src/region_union.h
M		src/variable.cpp
M		src/version.h
A	(dir)	tools/kate/
A		tools/kate/README.txt
A		tools/kate/lammps.xml