Merge branch 'upload'
5714e73cad9a
Actions

Authored by W. Michael Brown <brownw@ornl.gov> on Nov 15 2011, 20:06.

Description

Merge branch 'upload'

Committed

W. Michael Brown <brownw@ornl.gov>

Nov 15 2011, 20:06

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

W. Michael Brown <brownw@ornl.gov> committed rLAMMPS5714e73cad9a: Merge branch 'upload' (authored by W. Michael Brown <brownw@ornl.gov>).Nov 15 2011, 20:06

Commit	Author	Details	Committed
55c3d17a55fb	W. Michael Brown	Moving eam/gpu into library and deleting src/ copies of eam on cpu.	Nov 15 2011
7a3c8430aa18	Nguyen	Merge branch 'master' of https://bitbucket.org/wb8/lal	Nov 15 2011
d667f1e3496a	Nguyen	Add EAM cpu/gpu tests	Nov 15 2011
638562ff63e8	Nguyen	Add pair eam and eam/gpu to src/	Nov 15 2011
b442201bf614	Nguyen	Add EAM potential to lib/gpu	Nov 15 2011

				Path
	M			lib/gpu/Nvidia.makefile
	A			lib/gpu/lal_eam.cpp
	A			lib/gpu/lal_eam.cu
	P			lib/gpu/lal_eam.h Copied from lib/gpu/lal_lj_expand.h
	A			lib/gpu/lal_eam_ext.cpp
	A			src/GPU/pair_eam_gpu.cpp
	P			src/GPU/pair_eam_gpu.h Copied from src/GPU/pair_lj_cut_gpu.h
	M			src/MAKE/Makefile.openmpi
	A			test/eam.cpu.in
	A			test/eam.cpu.log
	A			test/eam.gpu.in
	A			test/eam.gpu.log
	A			test/ring.data