Merge branch 'upload'
48e5cd3228b8
Actions

Authored by Mike Brown <wb8@yona-login1.ccs.ornl.gov> on Apr 13 2011, 22:33.

Description

Merge branch 'upload'

Committed

Mike Brown <wb8@yona-login1.ccs.ornl.gov>

Apr 13 2011, 22:33

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Mike Brown <wb8@yona-login1.ccs.ornl.gov> committed rLAMMPS48e5cd3228b8: Merge branch 'upload' (authored by Mike Brown <wb8@yona-login1.ccs.ornl.gov>).Apr 13 2011, 22:33

	Commit			Author	Details	Committed
	2b37bf3d416f			W. Michael Brown	Some block sizes are now selected based on arch.	Apr 13 2011

				Path
	M			lib/gpu/Nvidia.makefile
	M			lib/gpu/charge_gpu_memory.cpp
	M			lib/gpu/charge_gpu_memory.h
	M			lib/gpu/charge_gpu_memory2.cpp
	M			lib/gpu/charge_gpu_memory2.h
	M			lib/gpu/cmm_cut_gpu_kernel.cu
	M			lib/gpu/cmmc_long_gpu_kernel.cu
	M			lib/gpu/cmmc_msm_gpu_kernel.cu
	M			lib/gpu/crml_gpu_kernel2.cu
	M			lib/gpu/crml_gpu_memory.cpp
	M			lib/gpu/crml_gpu_memory2.cpp
	M			lib/gpu/gb_gpu_kernel_nbor.cu
	M			lib/gpu/lj96_cut_gpu_kernel.cu
	M			lib/gpu/lj_cut_gpu_kernel.cu
	M			lib/gpu/lj_expand_gpu_kernel.cu
	M			lib/gpu/ljc_cut_gpu_kernel.cu
	M			lib/gpu/ljcl_cut_gpu_kernel.cu
	M			lib/gpu/morse_gpu_kernel.cu
	P			lib/gpu/nv_kernel_def.h Copied from lib/gpu/pair_gpu_atom_kernel.cu
	M			lib/gpu/pair_gpu_build_kernel.cu
	M			lib/gpu/pair_gpu_dev_kernel.cu