Merge branch 'master' into collected-small-fixes
4216be49f3ce
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 28 2016, 16:46.

Description

Merge branch 'master' into collected-small-fixes

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 28 2016, 16:46

Pushed

junge

Oct 19 2017, 09:53

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS4216be49f3ce: Merge branch 'master' into collected-small-fixes (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 28 2016, 16:46

	Commit			Author	Details	Committed
	d9891abdf4d5			Steve Plimpton	new library functions	Oct 27 2016

				Path
	M			doc/src/Manual.txt
	M			doc/src/Section_howto.txt
	M			doc/src/Section_python.txt
	M			examples/COUPLE/simple/in.lj
	M			examples/COUPLE/simple/simple.c
	M			examples/COUPLE/simple/simple.cpp
	M			python/examples/simple.py
	M			python/lammps.py
	M			src/KOKKOS/Install.sh
	M			src/KOKKOS/fix_qeq_reax_kokkos.cpp
	A			src/KOKKOS/fix_reaxc_bonds_kokkos.cpp
	P			src/KOKKOS/fix_reaxc_bonds_kokkos.h Copied from src/USER-EFF/compute_ke_atom_eff.h
	A			src/KOKKOS/fix_reaxc_species_kokkos.cpp
	P			src/KOKKOS/fix_reaxc_species_kokkos.h Copied from src/USER-EFF/fix_nvt_sllod_eff.h
	M			src/KOKKOS/neighbor_kokkos.cpp
	M			src/KOKKOS/neighbor_kokkos.h
	M			src/KOKKOS/pair_kokkos.h
	M			src/KOKKOS/pair_reax_c_kokkos.cpp
	M			src/KOKKOS/pair_reax_c_kokkos.h
	M			src/USER-REAXC/compute_spec_atom.cpp
	M			src/USER-REAXC/fix_reaxc_bonds.cpp
	M			src/USER-REAXC/fix_reaxc_bonds.h
	M			src/USER-REAXC/fix_reaxc_species.cpp
	M			src/USER-REAXC/fix_reaxc_species.h
	M			src/atom.cpp
	M			src/atom.h
	M			src/create_atoms.cpp
	M			src/delete_atoms.cpp
	M			src/delete_atoms.h
	M			src/domain.cpp
	M			src/domain.h
	M			src/fix_nh.cpp
	M			src/input.cpp
	M			src/library.cpp
	M			src/library.h
	M			src/read_data.cpp
	M			src/read_dump.cpp
	M			src/region.cpp
	M			src/region.h
	M			src/region_intersect.cpp
	M			src/region_union.cpp
	M			src/verlet.cpp
	M			src/verlet.h
	M			src/version.h