Merge branch 'upload'
385080beabc5
Actions

Authored by Mike Brown <wb8@lens-login3.ccs.ornl.gov> on Apr 15 2011, 16:53.

Description

Merge branch 'upload'

Committed

Mike Brown <wb8@lens-login3.ccs.ornl.gov>

Apr 15 2011, 16:53

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Mike Brown <wb8@lens-login3.ccs.ornl.gov> committed rLAMMPS385080beabc5: Merge branch 'upload' (authored by Mike Brown <wb8@lens-login3.ccs.ornl.gov>).Apr 15 2011, 16:53

	Commit			Author	Details	Committed
	c38092fa3386			W. Michael Brown	Some bug fixes and updated to default of 8 threads per atom.	Apr 15 2011
	e27ca98bb839			W. Michael Brown	Untested update of entire GPU library to use multiple threads per atom.	Apr 14 2011

				Path
	M			lib/gpu/atomic_gpu_memory.cpp
	M			lib/gpu/atomic_gpu_memory.h
	M			lib/gpu/charge_gpu_memory.cpp
	M			lib/gpu/charge_gpu_memory.h
	M			lib/gpu/cmm_cut_gpu_kernel.cu
	M			lib/gpu/cmm_cut_gpu_memory.cpp
	M			lib/gpu/cmmc_long_gpu_kernel.cu
	M			lib/gpu/cmmc_long_gpu_memory.cpp
	M			lib/gpu/cmmc_msm_gpu_kernel.cu
	M			lib/gpu/cmmc_msm_gpu_memory.cpp
	M			lib/gpu/crml_gpu_kernel.cu
	M			lib/gpu/crml_gpu_memory.cpp
	M			lib/gpu/gb_gpu.cpp
	M			lib/gpu/gb_gpu_extra.h
	M			lib/gpu/gb_gpu_kernel.cu
	M			lib/gpu/gb_gpu_kernel_lj.cu
	M			lib/gpu/gb_gpu_memory.cpp
	M			lib/gpu/gb_gpu_memory.h
	M			lib/gpu/lj96_cut_gpu_kernel.cu
	M			lib/gpu/lj96_cut_gpu_memory.cpp
	M			lib/gpu/lj_cut_gpu_kernel.cu
	M			lib/gpu/lj_cut_gpu_memory.cpp
	M			lib/gpu/lj_expand_gpu_kernel.cu
	M			lib/gpu/lj_expand_gpu_memory.cpp
	M			lib/gpu/ljc_cut_gpu_kernel.cu
	M			lib/gpu/ljc_cut_gpu_memory.cpp
	M			lib/gpu/ljcl_cut_gpu_kernel.cu
	M			lib/gpu/ljcl_cut_gpu_memory.cpp
	M			lib/gpu/morse_gpu_kernel.cu
	M			lib/gpu/morse_gpu_memory.cpp
	M			lib/gpu/nv_kernel_def.h