Merge branch 'trung-tersoff-update' into lammps-icms
0dfaf71ffed4
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 28 2016, 13:23.

Description

Merge branch 'trung-tersoff-update' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 28 2016, 13:23

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS0dfaf71ffed4: Merge branch 'trung-tersoff-update' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 28 2016, 13:23

	Commit			Author	Details	Committed
	7910ec32971f			Axel Kohlmeyer	update from trung with bugfixes for tersoff/sw and new tersoff/mod/gpu and…	Mar 28 2016

				Path
	M			doc/pair_tersoff_mod.txt
	M			doc/pair_tersoff_zbl.txt
	M			lib/gpu/Nvidia.makefile
	M			lib/gpu/Opencl.makefile
	M			lib/gpu/lal_sw.cpp
	M			lib/gpu/lal_sw.cu
	P			lib/gpu/lal_tersoff.cpp Copied to multiple locations: lib/gpu/lal_tersoff_mod.cpp lib/gpu/lal_tersoff_zbl.cpp
	P			lib/gpu/lal_tersoff.cu Copied to multiple locations: lib/gpu/lal_tersoff_mod.cu lib/gpu/lal_tersoff_zbl.cu
	P			lib/gpu/lal_tersoff.h Copied to multiple locations: lib/gpu/lal_tersoff_mod.h lib/gpu/lal_tersoff_zbl.h
	P			lib/gpu/lal_tersoff_extra.h Copied to multiple locations: lib/gpu/lal_tersoff_mod_extra.h lib/gpu/lal_tersoff_zbl_extra.h
	P			lib/gpu/lal_tersoff_mod.cpp Copied from lib/gpu/lal_tersoff.cpp
	P			lib/gpu/lal_tersoff_mod.cu Copied from lib/gpu/lal_tersoff.cu
	P			lib/gpu/lal_tersoff_mod.h Copied from lib/gpu/lal_tersoff.h
	A			lib/gpu/lal_tersoff_mod_ext.cpp
	P			lib/gpu/lal_tersoff_mod_extra.h Copied from lib/gpu/lal_tersoff_extra.h
	P			lib/gpu/lal_tersoff_zbl.cpp Copied from lib/gpu/lal_tersoff.cpp
	P			lib/gpu/lal_tersoff_zbl.cu Copied from lib/gpu/lal_tersoff.cu
	P			lib/gpu/lal_tersoff_zbl.h Copied from lib/gpu/lal_tersoff.h
	A			lib/gpu/lal_tersoff_zbl_ext.cpp
	P			lib/gpu/lal_tersoff_zbl_extra.h Copied from lib/gpu/lal_tersoff_extra.h
	M			src/GPU/Install.sh
	A			src/GPU/pair_tersoff_mod_gpu.cpp
	A			src/GPU/pair_tersoff_mod_gpu.h
	A			src/GPU/pair_tersoff_zbl_gpu.cpp
	A			src/GPU/pair_tersoff_zbl_gpu.h
	M			src/MANYBODY/pair_tersoff_zbl.h