Diffusion lammps ced36672bcfb

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…
ced36672bcfb
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 8 2014, 16:14.

Description

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 8 2014, 16:14

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS7fd7b990c960: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
rLAMMPS58c9dbe24f4a: yet another bugfix from trung to fix segfaults with gpu library

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSced36672bcfb: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 8 2014, 16:14

Merged Changes

Commit	Author	Details	Committed
7fd7b990c960	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jan 8 2014
f9ac6293ec59	Axel Kohlmeyer	fix bug found by paul coffman	Jan 8 2014
1d9125091abd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11188 f3b2605a-c512-4ea7…	Jan 7 2014
d7d65422ad23	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11187 f3b2605a-c512-4ea7…	Jan 7 2014
8f6ebb6bc944	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11186 f3b2605a-c512-4ea7…	Jan 7 2014
a3d2727a1852	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11179 f3b2605a-c512-4ea7…	Jan 7 2014
8c3ccb99e2a4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11178 f3b2605a-c512-4ea7…	Jan 7 2014
225ffd1a30a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11173 f3b2605a-c512-4ea7…	Jan 7 2014
31a4282f405f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11172 f3b2605a-c512-4ea7…	Jan 7 2014
6c45604c2ad8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11171 f3b2605a-c512-4ea7…	Jan 7 2014
2dd06d4ad57e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11170 f3b2605a-c512-4ea7…	Jan 7 2014
5d6442a1c093	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11169 f3b2605a-c512-4ea7…	Jan 7 2014
fcc2b0066bb6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11168 f3b2605a-c512-4ea7…	Jan 7 2014
8ab21ecdf573	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11167 f3b2605a-c512-4ea7…	Jan 7 2014
82b403f3faeb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11166 f3b2605a-c512-4ea7…	Jan 7 2014
e8c3b9e4df00	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11165 f3b2605a-c512-4ea7…	Jan 7 2014
5f7c2e1f8acf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11164 f3b2605a-c512-4ea7…	Jan 7 2014
83d75279ae77	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11162 f3b2605a-c512-4ea7…	Jan 7 2014
98b33ca794b4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11161 f3b2605a-c512-4ea7…	Jan 7 2014
5d17e2fec644	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11160 f3b2605a-c512-4ea7…	Jan 7 2014
681bcc9809f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11159 f3b2605a-c512-4ea7…	Jan 7 2014
b4682159ff0b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11158 f3b2605a-c512-4ea7…	Jan 7 2014
22deb3264d3a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11157 f3b2605a-c512-4ea7…	Jan 7 2014
616de8467193	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11156 f3b2605a-c512-4ea7…	Jan 7 2014
e6d008ef3967	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11155 f3b2605a-c512-4ea7…	Jan 7 2014
7292ac74026a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11154 f3b2605a-c512-4ea7…	Jan 7 2014
7d07af25b52d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11153 f3b2605a-c512-4ea7…	Jan 7 2014
ed5011e58859	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11152 f3b2605a-c512-4ea7…	Jan 7 2014
5ca5395c1624	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11151 f3b2605a-c512-4ea7…	Jan 7 2014
c4bc0ca8f2f9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11150 f3b2605a-c512-4ea7…	Jan 7 2014
4f40cb9decd5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11149 f3b2605a-c512-4ea7…	Jan 7 2014

Changes (84)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/fix_deposit.html
	M			doc/fix_deposit.txt
	M			doc/fix_pour.html
	M			doc/fix_pour.txt
	M			doc/fix_rigid.html
	M			doc/fix_rigid.txt
	M			doc/fix_shake.html
	M			doc/fix_shake.txt
	M			doc/molecule.html
	M			doc/molecule.txt
	M			examples/README
	M			examples/body/in.body
	M			examples/colloid/in.colloid
	M			examples/comb/in.comb.Cu
	M			examples/comb/in.comb.HfO2
	M			examples/comb/in.comb.Si
	M			examples/crack/in.crack
	M			examples/deposit/in.deposit.atom
	P			examples/deposit/in.deposit.molecule Copied to examples/deposit/in.deposit.molecule.shake
	P			examples/deposit/in.deposit.molecule.shake Copied from examples/deposit/in.deposit.molecule
	M			examples/deposit/log.deposit.molecule.17Dec13.linux.1
	M			examples/deposit/log.deposit.molecule.17Dec13.linux.4
	A			examples/deposit/log.deposit.molecule.shake.31Dec13.linux.1
	A			examples/deposit/log.deposit.molecule.shake.31Dec13.linux.4
	A			examples/deposit/molecule.dimer.shake
	M			examples/eim/in.eim
	M			examples/ellipse/in.ellipse.gayberne
	M			examples/ellipse/in.ellipse.resquared
	M			examples/flow/in.flow.couette
	M			examples/flow/in.flow.pois
	M			examples/friction/in.friction
	M			examples/hugoniostat/in.hugoniostat
	M			examples/indent/in.indent
	M			examples/indent/in.indent.min
	M			examples/meam/in.meam
	M			examples/meam/in.meam.shear
	M			examples/melt/in.melt
	M			examples/micelle/in.micelle
	M			examples/min/in.min
	M			examples/min/in.min.box
	M			examples/msst/in.msst
	M			examples/nemd/in.nemd
	M			examples/obstacle/in.obstacle
	M			examples/peptide/in.peptide
	M			examples/peri/in.peri
	M			examples/pour/in.pour
	P			examples/pour/in.pour.2d Copied to examples/pour/in.pour.2d.molecule
	P			examples/pour/in.pour.2d.molecule Copied from examples/pour/in.pour.2d
	A			examples/pour/log.pour.2d.molecule.31Dec13.linux.1
	A			examples/pour/log.pour.2d.molecule.31Dec13.linux.4
	A			examples/pour/molecule.vshape
	M			examples/reax/in.reax.rdx
	M			examples/reax/in.reax.tatb
	M			examples/reax/in.reaxc.rdx
	M			examples/reax/in.reaxc.tatb
	M			examples/rigid/in.rigid
	M			examples/rigid/in.rigid.poems
	M			examples/rigid/in.rigid.poems2
	M			examples/shear/in.shear
	M			examples/shear/in.shear.void
	M			examples/srd/in.srd.mixture
	M			examples/srd/in.srd.pure
	M			src/GRANULAR/fix_pour.cpp
	M			src/GRANULAR/fix_pour.h
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/MC/fix_gcmc.cpp
	V			src/{MISC ← }/fix_deposit.cpp
	V			src/{MISC ← }/fix_deposit.h
	M			src/RIGID/fix_rigid_small.cpp
	M			src/RIGID/fix_rigid_small.h
	V			src/{RIGID ← }/fix_shake.cpp
	V			src/{RIGID ← }/fix_shake.h
	M			src/USER-OMP/neigh_half_bin_omp.cpp
	M			src/fix.h
	V			src/{ → MISC}/fix_deposit.cpp
	V			src/{ → MISC}/fix_deposit.h
	V			src/{ → RIGID}/fix_shake.cpp
	V			src/{ → RIGID}/fix_shake.h
	M			src/fix_temp_rescale.cpp
	M			src/molecule.cpp
	M			src/molecule.h
	M			src/version.h