Diffusion lammps 1ee7cb100d97

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 8 2014, 01:29.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/atom_vec_hybrid.cpp
src/verlet.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 8 2014, 01:29

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS52a1ef7a14ad: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12105 f3b2605a-c512-4ea7…
rLAMMPScbdad2a2b3d3: Merge remote branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1ee7cb100d97: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 8 2014, 01:29

Merged Changes

Commit	Author	Details	Committed
52a1ef7a14ad	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12105 f3b2605a-c512-4ea7…	Jun 7 2014
16882404735f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12104 f3b2605a-c512-4ea7…	Jun 7 2014
dd47fb6414a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12100 f3b2605a-c512-4ea7…	Jun 7 2014
2f48597773ba	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12099 f3b2605a-c512-4ea7…	Jun 7 2014
87d0ff963b49	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12098 f3b2605a-c512-4ea7…	Jun 7 2014
d5a534235500	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12097 f3b2605a-c512-4ea7…	Jun 7 2014
6123f2420033	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12096 f3b2605a-c512-4ea7…	Jun 7 2014
a466230f4a9e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12095 f3b2605a-c512-4ea7…	Jun 6 2014
560ca5bb7d66	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12094 f3b2605a-c512-4ea7…	Jun 6 2014
7c995e30f249	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12093 f3b2605a-c512-4ea7…	Jun 6 2014
0078b0956b6f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12090 f3b2605a-c512-4ea7…	Jun 5 2014
8dad71810cf4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12089 f3b2605a-c512-4ea7…	Jun 5 2014
3f16021ba13b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12088 f3b2605a-c512-4ea7…	Jun 5 2014
55a2e9924f1b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12087 f3b2605a-c512-4ea7…	Jun 5 2014
331cec9038fc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12086 f3b2605a-c512-4ea7…	Jun 5 2014
b2fa4e6c90f0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12080 f3b2605a-c512-4ea7…	Jun 5 2014
135f239f624c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12079 f3b2605a-c512-4ea7…	Jun 5 2014
52f7ca6f6adf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12078 f3b2605a-c512-4ea7…	Jun 5 2014
fdc8a4f83b81	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12077 f3b2605a-c512-4ea7…	Jun 5 2014
b220b43477c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12076 f3b2605a-c512-4ea7…	Jun 5 2014
01820feacdc4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12075 f3b2605a-c512-4ea7…	Jun 5 2014
23a05b2ddd96	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12074 f3b2605a-c512-4ea7…	Jun 5 2014
47b6b3bb41cd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12073 f3b2605a-c512-4ea7…	Jun 5 2014
c7fc1ead1f57	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12072 f3b2605a-c512-4ea7…	Jun 4 2014
fa1d80c9d802	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12071 f3b2605a-c512-4ea7…	Jun 4 2014
58a3ddffd509	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12070 f3b2605a-c512-4ea7…	Jun 4 2014
1f667449d192	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12069 f3b2605a-c512-4ea7…	Jun 4 2014
88a3f9d32673	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12068 f3b2605a-c512-4ea7…	Jun 4 2014
63aad352fa18	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12067 f3b2605a-c512-4ea7…	Jun 4 2014
c4c6bae7dc53	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12066 f3b2605a-c512-4ea7…	Jun 4 2014
3428fa652f97	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12065 f3b2605a-c512-4ea7…	Jun 4 2014
9ed109011122	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12064 f3b2605a-c512-4ea7…	Jun 4 2014

Changes (103)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		bench/GPU/README
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_accelerate.html
M		doc/Section_accelerate.txt
M		doc/Section_errors.html
M		doc/Section_errors.txt
M		doc/Section_start.html
M		doc/Section_start.txt
M		doc/compute_property_atom.html
M		doc/compute_property_atom.txt
M		doc/dump.html
M		doc/dump.txt
M		doc/pair_buck_long.html
M		doc/pair_buck_long.txt
M		doc/pair_dpd.html
M		doc/pair_dpd.txt
M		doc/pair_eff.html
M		doc/pair_eff.txt
M		doc/pair_gran.html
M		doc/pair_gran.txt
M		doc/pair_style.html
M		doc/pair_style.txt
M		doc/thermo_style.html
M		doc/thermo_style.txt
M		examples/ASPHERE/box/in.box
M		examples/ASPHERE/box/in.box.mp
M		examples/ASPHERE/dimer/in.dimer
M		examples/ASPHERE/dimer/in.dimer.mp
M		examples/ASPHERE/ellipsoid/in.ellipsoid
M		examples/ASPHERE/ellipsoid/in.ellipsoid.mp
M		examples/ASPHERE/line/in.line.srd
M		examples/ASPHERE/poly/in.poly
M		examples/ASPHERE/poly/in.poly.mp
M		examples/ASPHERE/star/in.star
M		examples/ASPHERE/star/in.star.mp
M		examples/ASPHERE/tri/in.tri.srd
M		examples/KAPPA/README
A	(dir)	examples/MC/
A		examples/MC/README
A		examples/MC/in.mc
A		examples/MC/log.mc.6Jun14
M		examples/README
M		examples/USER/eff/Auger-Adamantane/in.adamantane_ionized.nve
M		examples/USER/eff/Be-solid/in.Be-solid.spe
M		examples/USER/eff/CH4/in.ch4.dynamics
M		examples/USER/eff/CH4/in.ch4.min
M		examples/USER/eff/CH4/in.ch4_ionized.dynamics
M		examples/USER/eff/H/in.h_atom.spe.ang
M		examples/USER/eff/H/in.h_atom.spe.bohr
M		examples/USER/eff/H2/in.h2
M		examples/USER/eff/H_plasma/in.h2bulk.npt
M		examples/USER/eff/H_plasma/in.h2bulk.nve
M		examples/USER/eff/H_plasma/in.h2bulk.nve.ang
M		examples/USER/eff/Li-dendritic/in.Li-dendritic.min
M		examples/USER/eff/Li-dendritic/in.Li-dendritic.nvt
M		examples/USER/eff/Li-solid/in.Li.ang
M		examples/USER/eff/Li-solid/in.Li.bohr
M		examples/kokkos/README
M		python/README
A		python/examples/in.mc
A		python/examples/mc.py
M		src/FLD/pair_lubricate.h
M		src/FLD/pair_lubricateU.h
M		src/FLD/pair_lubricateU_poly.h
M		src/FLD/pair_lubricate_poly.h
M		src/GRANULAR/pair_gran_hooke_history.h
M		src/Makefile.shlib
M		src/PERI/atom_vec_peri.cpp
M		src/PERI/atom_vec_peri.h
M		src/SRD/fix_srd.h
M		src/USER-AWPMD/atom_vec_wavepacket.cpp
M		src/USER-AWPMD/atom_vec_wavepacket.h
M		src/USER-EFF/atom_vec_electron.cpp
M		src/USER-EFF/atom_vec_electron.h
M		src/USER-SPH/atom_vec_meso.cpp
M		src/USER-SPH/atom_vec_meso.h
M		src/USER-SPH/fix_meso.cpp
M		src/USER-SPH/fix_meso.h
M		src/atom.cpp
M		src/atom.h
M		src/atom_vec.cpp
M		src/atom_vec.h
M		src/atom_vec_hybrid.cpp
M		src/atom_vec_hybrid.h
M		src/compute_property_atom.cpp
M		src/compute_property_atom.h
M		src/dump_custom.cpp
M		src/dump_custom.h
M		src/lammps.cpp
M		src/min.cpp
M		src/min.h
M		src/output.cpp
M		src/pair_dpd.h
M		src/rerun.cpp
M		src/respa.cpp
M		src/respa.h
M		src/thermo.cpp
M		src/thermo.h
M		src/variable.cpp
M		src/verlet.cpp
M		src/verlet.h
M		src/version.h