Merge branch 'upload'
99381e0f1962
Actions

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

Description

Merge branch 'upload'

Committed

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

Apr 13 2011, 20:00

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

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

	Commit			Author	Details	Committed
	5ff6092ea14f			W. Michael Brown	Updating all preprocessor defines to be set by a kernel. Adding a threads per…	Apr 13 2011

				Path
	M			lib/gpu/charge_gpu_memory2.cpp
	M			lib/gpu/cmm_cut_gpu_memory.cpp
	M			lib/gpu/cmmc_long_gpu_memory.cpp
	M			lib/gpu/cmmc_msm_gpu_memory.cpp
	M			lib/gpu/crml_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_memory.cpp
	M			lib/gpu/lj96_cut_gpu_memory.cpp
	M			lib/gpu/lj_cut_gpu_memory.cpp
	M			lib/gpu/lj_expand_gpu_memory.cpp
	M			lib/gpu/ljc_cut_gpu_memory.cpp
	M			lib/gpu/ljcl_cut_gpu_memory.cpp
	M			lib/gpu/morse_gpu_memory.cpp
	M			lib/gpu/pair_gpu_dev_kernel.cu
	M			lib/gpu/pair_gpu_device.cpp
	M			lib/gpu/pair_gpu_device.h
	M			lib/gpu/pair_gpu_nbor.cpp
	M			lib/gpu/pair_gpu_nbor.h
	M			lib/gpu/pppm_gpu_memory.cpp
	M			src/GPU/fix_gpu.cpp