Diffusion lammps d12eca24b839

Merge remote branch 'lammps-ro/master' into lammps-icms
d12eca24b839
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 6 2014, 15:25.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/lmptype.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 6 2014, 15:25

Pushed

junge

Oct 6 2016, 16:49

Parents

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

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd12eca24b839: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 6 2014, 15:25

Merged Changes

Commit	Author	Details	Committed
cc1d9b37507a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12430 f3b2605a-c512-4ea7…	Sep 6 2014
d4e1503e81fb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12429 f3b2605a-c512-4ea7…	Sep 6 2014
69f3347ce485	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12427 f3b2605a-c512-4ea7…	Sep 6 2014
3e4d6f2096d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12426 f3b2605a-c512-4ea7…	Sep 6 2014
af21769abebf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12425 f3b2605a-c512-4ea7…	Sep 6 2014
a6e421220999	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12424 f3b2605a-c512-4ea7…	Sep 6 2014
41eef5be6bc8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12423 f3b2605a-c512-4ea7…	Sep 6 2014
04265d585e95	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12422 f3b2605a-c512-4ea7…	Sep 6 2014
92992e325a25	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12421 f3b2605a-c512-4ea7…	Sep 6 2014
05f0f1d62782	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12420 f3b2605a-c512-4ea7…	Sep 6 2014
77dedf106316	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12419 f3b2605a-c512-4ea7…	Sep 6 2014
b3e0966911ca	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12418 f3b2605a-c512-4ea7…	Sep 6 2014
f29fa0abfb99	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12417 f3b2605a-c512-4ea7…	Sep 5 2014
f05bbe48ae12	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12416 f3b2605a-c512-4ea7…	Sep 5 2014
2011475077e1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12415 f3b2605a-c512-4ea7…	Sep 5 2014
076914c7ab10	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12414 f3b2605a-c512-4ea7…	Sep 5 2014
ed06a4859ee3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12413 f3b2605a-c512-4ea7…	Sep 5 2014
2a24e947f5d1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12412 f3b2605a-c512-4ea7…	Sep 5 2014
1fc5efe31e17	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12411 f3b2605a-c512-4ea7…	Sep 5 2014
4a95e6911174	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12410 f3b2605a-c512-4ea7…	Sep 5 2014
31509b75280e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12409 f3b2605a-c512-4ea7…	Sep 5 2014
8dce3d380cf8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12408 f3b2605a-c512-4ea7…	Sep 5 2014
05aa1d3b8708	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12407 f3b2605a-c512-4ea7…	Sep 5 2014
777e82995de2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12406 f3b2605a-c512-4ea7…	Sep 5 2014
f6c0d4fec3e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12405 f3b2605a-c512-4ea7…	Sep 5 2014
68d424d3fc79	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12404 f3b2605a-c512-4ea7…	Sep 5 2014

Changes (79)

		Path
A		doc/Eqs/compute_sna_atom1.jpg
A		doc/Eqs/compute_sna_atom1.tex
A		doc/Eqs/compute_sna_atom2.jpg
A		doc/Eqs/compute_sna_atom2.tex
A		doc/Eqs/compute_sna_atom3.jpg
A		doc/Eqs/compute_sna_atom3.tex
A		doc/Eqs/compute_sna_atom4.jpg
A		doc/Eqs/compute_sna_atom4.tex
A		doc/Eqs/compute_sna_atom5.jpg
A		doc/Eqs/compute_sna_atom5.tex
A		doc/Eqs/compute_sna_atom6.jpg
A		doc/Eqs/compute_sna_atom6.tex
A		doc/Eqs/pair_snap.jpg
A		doc/Eqs/pair_snap.tex
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_example.html
M		doc/Section_example.txt
M		doc/Section_intro.html
M		doc/Section_intro.txt
M		doc/Section_packages.html
M		doc/Section_packages.txt
M		doc/Section_start.html
M		doc/Section_start.txt
M		doc/compute.html
M		doc/compute.txt
A		doc/compute_sna_atom.html
A		doc/compute_sna_atom.txt
M		doc/fix_addforce.html
M		doc/fix_addforce.txt
A		doc/pair_snap.html
A		doc/pair_snap.txt
M		doc/pair_style.html
M		doc/pair_style.txt
M		examples/README
A	(dir)	examples/snap/
A		examples/snap/Ta06A.snapcoeff
A		examples/snap/Ta06A.snapparam
A		examples/snap/Ta06A_pot.snap
A		examples/snap/in.snap
A		examples/snap/log.snap.5Sep14.linux.1
A		examples/snap/log.snap.5Sep14.linux.4
M		lib/atc/ATC_Method.cpp
M		potentials/README
A		potentials/Ta06A.snapcoeff
A		potentials/Ta06A.snapparam
A		potentials/Ta06A_pot.snap
M		src/KOKKOS/atom_kokkos.cpp
M		src/KOKKOS/atom_kokkos.h
M		src/KOKKOS/atom_vec_angle_kokkos.cpp
M		src/KOKKOS/atom_vec_atomic_kokkos.cpp
M		src/KOKKOS/atom_vec_bond_kokkos.cpp
M		src/KOKKOS/atom_vec_charge_kokkos.cpp
M		src/KOKKOS/atom_vec_full_kokkos.cpp
M		src/KOKKOS/atom_vec_molecular_kokkos.cpp
M		src/KOKKOS/fix_nve_kokkos.cpp
P		src/MAKE/#Makefile.g++# Copied from src/MAKE/Makefile.serial_debug
V		src/MAKE/{Makefile.debug ← Makefile.serial_debug}
P		src/MAKE/Makefile.serial_debug Deleted after being copied to multiple locations: src/MAKE/#Makefile.g++# src/MAKE/Makefile.debug
M		src/Makefile
A	(dir)	src/SNAP/
A		src/SNAP/compute_sna_atom.cpp
A		src/SNAP/compute_sna_atom.h
A		src/SNAP/compute_snad_atom.cpp
A		src/SNAP/compute_snad_atom.h
A		src/SNAP/compute_snav_atom.cpp
A		src/SNAP/compute_snav_atom.h
A		src/SNAP/openmp_snap.h
A		src/SNAP/pair_snap.cpp
A		src/SNAP/pair_snap.h
A		src/SNAP/sna.cpp
A		src/SNAP/sna.h
M		src/atom.h
M		src/delete_atoms.cpp
M		src/fix_addforce.cpp
M		src/lmptype.h
M		src/version.h