Diffusion lammps d4ada34579ad

Merge branch 'master' into lammps-icms
d4ada34579ad
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 24 2010, 18:31.

Description

Merge branch 'master' into lammps-icms

merge in gpu pair style update from master.
needed to resolve lots of whitespace conflicts.

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 24 2010, 18:31

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS8ba792f112fd: Updating restart2data.cpp to reflect new GPU pair styles --- all changes…
rLAMMPS44d7df116418: use fftw-3 instead of fftw-2 on fermi

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd4ada34579ad: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 24 2010, 18:31

Merged Changes

Commit	Author	Details	Committed
8ba792f112fd	pscrozi	Updating restart2data.cpp to reflect new GPU pair styles --- all changes…	Nov 23 2010
04de31551c6e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5291 f3b2605a-c512-4ea7…	Nov 23 2010
32f7b3979376	pscrozi	Getting rid of extra CR characters at ends of lines.	Nov 23 2010
818274028d19	pscrozi	Getting rid of extra CR characters at ends of lines.	Nov 23 2010
69aac27448b2	pscrozi	Getting rid of extra CR characters at ends of lines.	Nov 23 2010
2e87b46aa4bd	pscrozi	Getting rid of extra CR characters at ends of lines.	Nov 23 2010
229a2cd7ffb9	pscrozi	Getting rid of extra CR characters at ends of lines.	Nov 23 2010
4366bfffd35e	pscrozi	Getting rid of extra CR characters at ends of lines.	Nov 23 2010
80a30880f82a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5283 f3b2605a-c512-4ea7…	Nov 23 2010
79b7bdd79107	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5282 f3b2605a-c512-4ea7…	Nov 23 2010
f5aced15ff37	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5281 f3b2605a-c512-4ea7…	Nov 23 2010
a20cc3b58808	pscrozi	Changes from Mike Changes from Mike Brown.	Nov 23 2010
64dc05333c46	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5279 f3b2605a-c512-4ea7…	Nov 23 2010
4e52d8d9274e	pscrozi	Changes from Mike Brown.	Nov 23 2010
5a82c99485e1	pscrozi	Changes from Mike Brown.	Nov 23 2010
ae536ce7d046	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5275 f3b2605a-c512-4ea7…	Nov 22 2010
cc9d61f406c8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5274 f3b2605a-c512-4ea7…	Nov 22 2010
7bfa8bee609e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5273 f3b2605a-c512-4ea7…	Nov 22 2010
f94cbbce155c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5272 f3b2605a-c512-4ea7…	Nov 22 2010

Changes (106)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/fix_ave_atom.html
	M			doc/fix_ave_atom.txt
	M			doc/fix_ave_correlate.html
	M			doc/fix_ave_correlate.txt
	M			doc/fix_ave_histo.html
	M			doc/fix_ave_histo.txt
	M			doc/fix_ave_spatial.html
	M			doc/fix_ave_spatial.txt
	M			doc/fix_ave_time.html
	M			doc/fix_ave_time.txt
	M			doc/fix_external.html
	M			doc/fix_external.txt
	M			doc/neb.html
	M			doc/neb.txt
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	D			lib/gpu/Makefile.cyg
	M			lib/gpu/Makefile.fermi
	M			lib/gpu/Makefile.lincoln
	M			lib/gpu/Opencl.makefile
	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.cpp
	M			lib/gpu/cmm_cut_gpu_memory.cpp
	M			lib/gpu/cmm_cut_gpu_memory.h
	M			lib/gpu/cmmc_long_gpu.cpp
	M			lib/gpu/cmmc_long_gpu_memory.cpp
	M			lib/gpu/cmmc_long_gpu_memory.h
	M			lib/gpu/cudpp_mini/cta/radixsort_cta.cu
	M			lib/gpu/cudpp_mini/cta/scan_cta.cu
	M			lib/gpu/cudpp_mini/cudpp.cpp
	M			lib/gpu/cudpp_mini/cudpp.h
	M			lib/gpu/cudpp_mini/cudpp_globals.h
	M			lib/gpu/cudpp_mini/cudpp_maximal_launch.cpp
	M			lib/gpu/cudpp_mini/cudpp_maximal_launch.h
	M			lib/gpu/cudpp_mini/cudpp_plan.cpp
	M			lib/gpu/cudpp_mini/cudpp_plan.h
	M			lib/gpu/cudpp_mini/cudpp_plan_manager.cpp
	M			lib/gpu/cudpp_mini/cudpp_plan_manager.h
	M			lib/gpu/cudpp_mini/cudpp_radixsort.h
	M			lib/gpu/cudpp_mini/cudpp_scan.h
	M			lib/gpu/cudpp_mini/cudpp_util.h
	M			lib/gpu/cudpp_mini/cutil.h
	M			lib/gpu/cudpp_mini/kernel/radixsort_kernel.cu
	M			lib/gpu/cudpp_mini/license.txt
	M			lib/gpu/cudpp_mini/radixsort_app.cu
	M			lib/gpu/cudpp_mini/sharedmem.h
	M			lib/gpu/gb_gpu.cpp
	M			lib/gpu/gb_gpu_memory.cpp
	M			lib/gpu/geryon/VERSION.txt
	M			lib/gpu/geryon/file_to_cstr.sh
	M			lib/gpu/geryon/nvc_device.h
	M			lib/gpu/geryon/nvc_macros.h
	M			lib/gpu/geryon/nvc_texture.h
	M			lib/gpu/geryon/nvd_device.h
	M			lib/gpu/geryon/nvd_kernel.h
	M			lib/gpu/geryon/nvd_macros.h
	M			lib/gpu/geryon/nvd_mat.h
	M			lib/gpu/geryon/nvd_memory.h
	M			lib/gpu/geryon/nvd_texture.h
	M			lib/gpu/geryon/nvd_timer.h
	M			lib/gpu/geryon/ocl_device.h
	M			lib/gpu/geryon/ocl_kernel.h
	M			lib/gpu/geryon/ocl_mat.h
	M			lib/gpu/geryon/ocl_texture.h
	M			lib/gpu/geryon/ocl_timer.h
	M			lib/gpu/geryon/ucl_arg_kludge.h
	M			lib/gpu/geryon/ucl_basemat.h
	M			lib/gpu/geryon/ucl_copy.h
	M			lib/gpu/geryon/ucl_d_mat.h
	M			lib/gpu/geryon/ucl_d_vec.h
	M			lib/gpu/geryon/ucl_get_devices.cpp
	M			lib/gpu/geryon/ucl_h_mat.h
	M			lib/gpu/geryon/ucl_h_vec.h
	M			lib/gpu/geryon/ucl_nv_kernel.h
	M			lib/gpu/geryon/ucl_print.h
	M			lib/gpu/geryon/ucl_types.h
	M			lib/gpu/lj96_cut_gpu.cpp
	M			lib/gpu/lj96_cut_gpu_memory.cpp
	M			lib/gpu/lj96_cut_gpu_memory.h
	M			lib/gpu/lj_cut_gpu.cpp
	M			lib/gpu/lj_cut_gpu_memory.cpp
	M			lib/gpu/lj_cut_gpu_memory.h
	M			lib/gpu/ljc_cut_gpu.cpp
	M			lib/gpu/ljc_cut_gpu_memory.cpp
	M			lib/gpu/ljc_cut_gpu_memory.h
	M			lib/gpu/ljcl_cut_gpu.cpp
	M			lib/gpu/ljcl_cut_gpu_memory.cpp
	M			lib/gpu/ljcl_cut_gpu_memory.h
	M			lib/gpu/pair_gpu_atom.cpp
	M			lib/gpu/pair_gpu_balance.h
	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_precision.h
	M			lib/gpu/pair_win_sort.cpp
	M			src/GPU/Install.sh
	M			src/fix_external.cpp
	M			src/fix_external.h
	M			src/fix_rigid.cpp
	M			src/fix_wall_region.cpp
	M			src/neighbor.cpp
	M			src/version.h
	M			tools/restart2data.cpp