Diffusion lammps 2aaf9f3d5937

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

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

Description

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

Resolved Conflicts:
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 23 2016, 12:32

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSaca24423f4c7: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14485 f3b2605a-c512-4ea7…
rLAMMPS666d63d81c9a: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2aaf9f3d5937: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 23 2016, 12:32

Merged Changes

Commit	Author	Details	Committed
aca24423f4c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14485 f3b2605a-c512-4ea7…	Jan 23 2016
f593ffb67b98	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14484 f3b2605a-c512-4ea7…	Jan 23 2016
67d5513df13b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14483 f3b2605a-c512-4ea7…	Jan 23 2016
b31f864e8341	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14482 f3b2605a-c512-4ea7…	Jan 23 2016
8b7e9fea4cb5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14481 f3b2605a-c512-4ea7…	Jan 23 2016
3621171480f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14480 f3b2605a-c512-4ea7…	Jan 23 2016
5d99bf664efb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14479 f3b2605a-c512-4ea7…	Jan 23 2016
7f049bb31b3d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14478 f3b2605a-c512-4ea7…	Jan 23 2016
627561054c70	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14477 f3b2605a-c512-4ea7…	Jan 23 2016
d4a5571aaba9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14476 f3b2605a-c512-4ea7…	Jan 23 2016
28d6cef69782	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14475 f3b2605a-c512-4ea7…	Jan 23 2016
79466c37d8e3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14474 f3b2605a-c512-4ea7…	Jan 23 2016
ad1d7ffdc70a	athomps	Fixed another bug in edge_histo	Jan 23 2016
34785af4a6a0	stamoor	Fixing Kokkos bugs	Jan 23 2016
c8fb84783edb	stamoor	Fixing Kokkos bug	Jan 22 2016
e3e687f7b35e	athomps	Added peratom keyword	Jan 22 2016

Changes (38)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/atom_style.html
	M			doc/atom_style.txt
	M			doc/body.html
	M			doc/compute.html
	M			doc/compute.txt
	M			doc/compute_voronoi_atom.html
	M			doc/compute_voronoi_atom.txt
	M			doc/delete_bonds.html
	M			doc/delete_bonds.txt
	M			doc/fix_nh.html
	M			doc/searchindex.js
	M			examples/USER/phonon/1-1D-mono/in.Ana
	M			src/GRANULAR/pair_gran_hertz_history.cpp
	M			src/GRANULAR/pair_gran_hooke.cpp
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/KOKKOS/pair_kokkos.h
	M			src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp
	M			src/KOKKOS/pair_lj_charmm_coul_long_kokkos.h
	M			src/KOKKOS/pair_lj_cut_kokkos.cpp
	M			src/KOKKOS/pair_lj_cut_kokkos.h
	M			src/VORONOI/compute_voronoi_atom.cpp
	M			src/VORONOI/compute_voronoi_atom.h
	M			src/atom_vec_line.cpp
	M			src/atom_vec_line.h
	M			src/atom_vec_tri.cpp
	M			src/atom_vec_tri.h
	M			src/fix_shear_history.h
	M			src/force.cpp
	M			src/force.h
	M			src/min.cpp
	M			src/pair.h
	M			src/pair_hybrid.cpp
	M			src/pair_hybrid.h
	M			src/respa.cpp
	M			src/verlet.cpp
	M			src/version.h