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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 19 2014, 13:04.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MAKE/Makefile.bgq
src/MAKE/Makefile.bgq.details
src/MC/fix_gcmc.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 19 2014, 13:04

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSbbc57688d8a5: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11833 f3b2605a-c512-4ea7…
rLAMMPSe83e04c92d37: update for GeForce TITAN GPU and CUDA RPM.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS517a48da9a86: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 19 2014, 13:04

Merged Changes

Commit	Author	Details	Committed
bbc57688d8a5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11833 f3b2605a-c512-4ea7…	Apr 18 2014
1cb89996dbdf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11832 f3b2605a-c512-4ea7…	Apr 18 2014
01d414a2da55	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11831 f3b2605a-c512-4ea7…	Apr 18 2014
4fa40b7f36b6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11830 f3b2605a-c512-4ea7…	Apr 18 2014
f461504c9398	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11829 f3b2605a-c512-4ea7…	Apr 18 2014
c62e2a91c441	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11828 f3b2605a-c512-4ea7…	Apr 18 2014
fa8155cb3162	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11827 f3b2605a-c512-4ea7…	Apr 18 2014
13a3caa87840	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11826 f3b2605a-c512-4ea7…	Apr 18 2014
d223faee38d1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11825 f3b2605a-c512-4ea7…	Apr 18 2014
d0d5c6437c5f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11824 f3b2605a-c512-4ea7…	Apr 18 2014
35b51e753d31	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11823 f3b2605a-c512-4ea7…	Apr 18 2014
8fcc38d60883	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11822 f3b2605a-c512-4ea7…	Apr 18 2014
287db2231ad2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11821 f3b2605a-c512-4ea7…	Apr 18 2014
d00fe7ee1d80	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11820 f3b2605a-c512-4ea7…	Apr 18 2014
576b75e0a1c5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11819 f3b2605a-c512-4ea7…	Apr 18 2014
257f5b6c2d6d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11818 f3b2605a-c512-4ea7…	Apr 18 2014
d46d8a7d9d13	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11817 f3b2605a-c512-4ea7…	Apr 18 2014
693e4e0e9468	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11816 f3b2605a-c512-4ea7…	Apr 18 2014
d58ddc31dafc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11815 f3b2605a-c512-4ea7…	Apr 18 2014

Changes (27)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/compute_voronoi_atom.html
	M			doc/compute_voronoi_atom.txt
	M			doc/fix_deposit.html
	M			doc/fix_deposit.txt
	M			doc/fix_gcmc.html
	M			doc/fix_pour.html
	M			doc/fix_pour.txt
	M			doc/special_bonds.html
	M			doc/special_bonds.txt
	M			examples/voronoi/in.voronoi
	M			src/GRANULAR/fix_pour.cpp
	M			src/MAKE/Makefile.bgq
	M			src/MAKE/Makefile.bgq.details
	M			src/MC/fix_bond_create.cpp
	M			src/MISC/fix_deposit.cpp
	M			src/USER-LB/README
	M			src/USER-LB/fix_lb_fluid.cpp
	M			src/USER-LB/fix_lb_pc.cpp
	M			src/USER-LB/fix_lb_rigid_pc_sphere.cpp
	M			src/VORONOI/README
	M			src/VORONOI/compute_voronoi_atom.cpp
	M			src/VORONOI/compute_voronoi_atom.h
	M			src/force.cpp
	M			src/neighbor.cpp
	M			src/version.h