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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 26 2016, 18:18.

Description

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

Resolved Conflicts:
doc/Manual.txt

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 26 2016, 18:18

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS445807e1f36b: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 26 2016, 18:18

Commit	Author	Details	Committed
e18635c5181a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14496 f3b2605a-c512-4ea7…	Jan 26 2016
c25e43186491	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14495 f3b2605a-c512-4ea7…	Jan 26 2016
49051197a92e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14494 f3b2605a-c512-4ea7…	Jan 26 2016
2d78e1a21597	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14493 f3b2605a-c512-4ea7…	Jan 26 2016
0fbc48723eaa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14492 f3b2605a-c512-4ea7…	Jan 25 2016
12858669c055	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14491 f3b2605a-c512-4ea7…	Jan 25 2016
bf9517b5623e	stamoor	Fixing Kokkos bugs	Jan 25 2016
92ae19e280bc	stamoor	Fixing Kokkos bugs	Jan 25 2016
9eb8702f2fe2	stamoor	Fixing Kokkos bugs	Jan 25 2016
775b163eaea0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14487 f3b2605a-c512-4ea7…	Jan 25 2016

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			src/KOKKOS/atom_kokkos.cpp
	M			src/KOKKOS/atom_kokkos.h
	M			src/KOKKOS/comm_kokkos.cpp
	M			src/KOKKOS/neigh_bond_kokkos.cpp
	M			src/KOKKOS/neigh_bond_kokkos.h
	M			src/KOKKOS/neighbor_kokkos.cpp
	M			src/KOKKOS/pair_sw_kokkos.cpp
	M			src/KOKKOS/pair_sw_kokkos.h
	M			src/KOKKOS/pair_tersoff_kokkos.cpp
	M			src/KOKKOS/pair_tersoff_kokkos.h
	M			src/KOKKOS/pair_tersoff_mod_kokkos.cpp
	M			src/KOKKOS/pair_tersoff_mod_kokkos.h
	M			src/KOKKOS/pair_tersoff_zbl_kokkos.cpp
	M			src/KOKKOS/pair_tersoff_zbl_kokkos.h
	M			src/MANYBODY/pair_comb.cpp
	M			src/MANYBODY/pair_comb.h
	M			src/MANYBODY/pair_comb3.cpp
	M			src/MANYBODY/pair_comb3.h
	M			src/MANYBODY/pair_nb3b_harmonic.cpp
	M			src/MANYBODY/pair_nb3b_harmonic.h
	M			src/MANYBODY/pair_polymorphic.cpp
	M			src/MANYBODY/pair_polymorphic.h
	M			src/MANYBODY/pair_sw.cpp
	M			src/MANYBODY/pair_sw.h
	M			src/MANYBODY/pair_tersoff.cpp
	M			src/MANYBODY/pair_tersoff.h
	M			src/MANYBODY/pair_tersoff_mod.cpp
	M			src/MANYBODY/pair_tersoff_mod.h
	M			src/MANYBODY/pair_vashishta.cpp
	M			src/MANYBODY/pair_vashishta.h
	M			src/USER-MISC/pair_edip.cpp
	M			src/USER-MISC/pair_edip.h
	M			src/USER-MISC/pair_tersoff_table.cpp
	M			src/USER-MISC/pair_tersoff_table.h
	M			src/atom.h
	M			src/fix_shear_history.h
	M			src/fix_store.cpp
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/pair_coul_streitz.cpp
	M			src/pair_coul_streitz.h
	M			src/version.h