Diffusion lammps 0d36adc00bf0

Merge branch 'master' into lammps-icms
0d36adc00bf0
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 23 2012, 17:58.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
lib/gpu/Nvidia.makefile
lib/gpu/Opencl.makefile

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 23 2012, 17:58

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS2512429ccf39: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8698 f3b2605a-c512-4ea7…
rLAMMPSd018338c60f0: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS0d36adc00bf0: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 23 2012, 17:58

Merged Changes

Commit	Author	Details	Committed
2512429ccf39	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8698 f3b2605a-c512-4ea7…	Aug 23 2012
0d188f1df234	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8697 f3b2605a-c512-4ea7…	Aug 21 2012
25a2d1753737	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8696 f3b2605a-c512-4ea7…	Aug 21 2012
55ad68cbe35a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8695 f3b2605a-c512-4ea7…	Aug 21 2012
647ea4c29f79	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8694 f3b2605a-c512-4ea7…	Aug 21 2012
31551d81fdf9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8693 f3b2605a-c512-4ea7…	Aug 21 2012
9a99e275524f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8692 f3b2605a-c512-4ea7…	Aug 21 2012
f0c10cfcbb5d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8691 f3b2605a-c512-4ea7…	Aug 21 2012
903a7a45cf6e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8690 f3b2605a-c512-4ea7…	Aug 21 2012
f1effd1c0d23	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8689 f3b2605a-c512-4ea7…	Aug 21 2012
5a71c1a39101	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8688 f3b2605a-c512-4ea7…	Aug 21 2012

Changes (181)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Manual.pdf
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/fix_nh.html
	M			doc/fix_nh.txt
	M			doc/fix_rigid.html
	M			doc/fix_rigid.txt
	M			doc/pair_born.html
	M			doc/pair_born.txt
	M			doc/pair_colloid.html
	M			doc/pair_colloid.txt
	M			doc/pair_coul.html
	M			doc/pair_coul.txt
	M			doc/pair_dipole.html
	M			doc/pair_dipole.txt
	M			doc/pair_gauss.html
	M			doc/pair_gauss.txt
	M			doc/pair_hybrid.html
	M			doc/pair_hybrid.txt
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	M			doc/pair_yukawa_colloid.html
	M			doc/pair_yukawa_colloid.txt
	M			lib/gpu/Nvidia.makefile
	M			lib/gpu/Opencl.makefile
	M			lib/gpu/geryon/README
	M			lib/gpu/geryon/VERSION.txt
	M			lib/gpu/geryon/nvd_device.h
	M			lib/gpu/geryon/nvd_kernel.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/ocl_device.h
	M			lib/gpu/geryon/ocl_kernel.h
	M			lib/gpu/geryon/ocl_mat.h
	M			lib/gpu/geryon/ocl_memory.h
	M			lib/gpu/geryon/ucl_arg_kludge.h
	M			lib/gpu/geryon/ucl_d_mat.h
	M			lib/gpu/geryon/ucl_d_vec.h
	M			lib/gpu/geryon/ucl_h_mat.h
	M			lib/gpu/geryon/ucl_h_vec.h
	A			lib/gpu/geryon/ucl_matrix.h
	M			lib/gpu/geryon/ucl_print.h
	A			lib/gpu/geryon/ucl_s_obj_help.h
	M			lib/gpu/geryon/ucl_types.h
	A			lib/gpu/geryon/ucl_vector.h
	M			lib/gpu/lal_answer.cpp
	M			lib/gpu/lal_answer.h
	M			lib/gpu/lal_atom.cpp
	M			lib/gpu/lal_atom.h
	M			lib/gpu/lal_base_atomic.cpp
	M			lib/gpu/lal_base_atomic.h
	P			lib/gpu/lal_base_charge.cpp Copied to lib/gpu/lal_base_dipole.cpp
	P			lib/gpu/lal_base_charge.h Copied to lib/gpu/lal_base_dipole.h
	P			lib/gpu/lal_base_dipole.cpp Copied from lib/gpu/lal_base_charge.cpp
	P			lib/gpu/lal_base_dipole.h Copied from lib/gpu/lal_base_charge.h
	M			lib/gpu/lal_base_ellipsoid.cpp
	M			lib/gpu/lal_base_ellipsoid.h
	P			lib/gpu/lal_born.cpp Copied from lib/gpu/lal_buck.cpp
	P			lib/gpu/lal_born.cu Copied from lib/gpu/lal_buck.cu
	A			lib/gpu/lal_born.h
	P			lib/gpu/lal_born_coul_long.cpp Copied from lib/gpu/lal_buck_coul_long.cpp
	P			lib/gpu/lal_born_coul_long.cu Copied from lib/gpu/lal_buck_coul_long.cu
	A			lib/gpu/lal_born_coul_long.h
	A			lib/gpu/lal_born_coul_long_ext.cpp
	P			lib/gpu/lal_born_coul_wolf.cpp Copied from lib/gpu/lal_buck_coul_long.cpp
	P			lib/gpu/lal_born_coul_wolf.cu Copied from lib/gpu/lal_buck_coul_long.cu
	A			lib/gpu/lal_born_coul_wolf.h
	A			lib/gpu/lal_born_coul_wolf_ext.cpp
	A			lib/gpu/lal_born_ext.cpp
	P			lib/gpu/lal_buck.cpp Copied to lib/gpu/lal_born.cpp
	P			lib/gpu/lal_buck.cu Copied to lib/gpu/lal_born.cu
	M			lib/gpu/lal_buck_coul.cpp
	M			lib/gpu/lal_buck_coul.cu
	P			lib/gpu/lal_buck_coul_long.cpp Copied to multiple locations: lib/gpu/lal_born_coul_long.cpp lib/gpu/lal_born_coul_wolf.cpp
	P			lib/gpu/lal_buck_coul_long.cu Copied to multiple locations: lib/gpu/lal_born_coul_long.cu lib/gpu/lal_born_coul_wolf.cu
	M			lib/gpu/lal_cg_cmm.cpp
	M			lib/gpu/lal_cg_cmm.cu
	M			lib/gpu/lal_cg_cmm_long.cpp
	M			lib/gpu/lal_cg_cmm_long.cu
	M			lib/gpu/lal_charmm_long.cpp
	M			lib/gpu/lal_charmm_long.cu
	A			lib/gpu/lal_colloid.cpp
	A			lib/gpu/lal_colloid.cu
	A			lib/gpu/lal_colloid.h
	A			lib/gpu/lal_colloid_ext.cpp
	P			lib/gpu/lal_coul_dsf.cpp Copied from lib/gpu/lal_yukawa.cpp
	A			lib/gpu/lal_coul_dsf.cu
	A			lib/gpu/lal_coul_dsf.h
	A			lib/gpu/lal_coul_dsf_ext.cpp
	M			lib/gpu/lal_coul_long.cpp
	M			lib/gpu/lal_coul_long.cu
	M			lib/gpu/lal_device.cpp
	M			lib/gpu/lal_device.h
	P			lib/gpu/lal_dipole_lj.cpp Copied from lib/gpu/lal_lj_coul.cpp
	A			lib/gpu/lal_dipole_lj.cu
	A			lib/gpu/lal_dipole_lj.h
	A			lib/gpu/lal_dipole_lj_ext.cpp
	P			lib/gpu/lal_dipole_lj_sf.cpp Copied from lib/gpu/lal_lj_coul.cpp
	A			lib/gpu/lal_dipole_lj_sf.cu
	A			lib/gpu/lal_dipole_lj_sf.h
	A			lib/gpu/lal_dipole_lj_sf_ext.cpp
	M			lib/gpu/lal_eam.cpp
	M			lib/gpu/lal_eam.cu
	M			lib/gpu/lal_eam.h
	M			lib/gpu/lal_ellipsoid_extra.h
	M			lib/gpu/lal_ellipsoid_nbor.cu
	P			lib/gpu/lal_gauss.cpp Copied from lib/gpu/lal_yukawa.cpp
	P			lib/gpu/lal_gauss.cu Copied from lib/gpu/lal_yukawa.cu
	A			lib/gpu/lal_gauss.h
	A			lib/gpu/lal_gauss_ext.cpp
	M			lib/gpu/lal_gayberne.cpp
	M			lib/gpu/lal_gayberne.cu
	M			lib/gpu/lal_gayberne_lj.cu
	M			lib/gpu/lal_lj.cpp
	M			lib/gpu/lal_lj.cu
	M			lib/gpu/lal_lj96.cpp
	M			lib/gpu/lal_lj96.cu
	M			lib/gpu/lal_lj_class2_long.cpp
	M			lib/gpu/lal_lj_class2_long.cu
	P			lib/gpu/lal_lj_coul.cpp Copied to multiple locations: lib/gpu/lal_dipole_lj.cpp lib/gpu/lal_dipole_lj_sf.cpp lib/gpu/lal_lj_coul_debye.cpp
	P			lib/gpu/lal_lj_coul.cu Copied to multiple locations: lib/gpu/lal_lj_coul_debye.cu lib/gpu/lal_lj_dsf.cu
	P			lib/gpu/lal_lj_coul_debye.cpp Copied from lib/gpu/lal_lj_coul.cpp
	P			lib/gpu/lal_lj_coul_debye.cu Copied from lib/gpu/lal_lj_coul.cu
	A			lib/gpu/lal_lj_coul_debye.h
	A			lib/gpu/lal_lj_coul_debye_ext.cpp
	P			lib/gpu/lal_lj_coul_long.cpp Copied to lib/gpu/lal_lj_dsf.cpp
	M			lib/gpu/lal_lj_coul_long.cu
	P			lib/gpu/lal_lj_dsf.cpp Copied from lib/gpu/lal_lj_coul_long.cpp
	P			lib/gpu/lal_lj_dsf.cu Copied from lib/gpu/lal_lj_coul.cu
	A			lib/gpu/lal_lj_dsf.h
	A			lib/gpu/lal_lj_dsf_ext.cpp
	M			lib/gpu/lal_lj_expand.cpp
	M			lib/gpu/lal_lj_expand.cu
	M			lib/gpu/lal_morse.cpp
	M			lib/gpu/lal_morse.cu
	M			lib/gpu/lal_neighbor.cpp
	M			lib/gpu/lal_neighbor.h
	M			lib/gpu/lal_neighbor_gpu.cu
	M			lib/gpu/lal_neighbor_shared.cpp
	M			lib/gpu/lal_neighbor_shared.h
	M			lib/gpu/lal_pppm.cpp
	M			lib/gpu/lal_pppm.cu
	M			lib/gpu/lal_pppm.h
	M			lib/gpu/lal_precision.h
	M			lib/gpu/lal_preprocessor.h
	M			lib/gpu/lal_re_squared.cpp
	M			lib/gpu/lal_re_squared.cu
	M			lib/gpu/lal_re_squared_lj.cu
	M			lib/gpu/lal_table.cpp
	M			lib/gpu/lal_table.cu
	P			lib/gpu/lal_yukawa.cpp Copied to multiple locations: lib/gpu/lal_coul_dsf.cpp lib/gpu/lal_gauss.cpp
	P			lib/gpu/lal_yukawa.cu Copied to multiple locations: lib/gpu/lal_gauss.cu lib/gpu/lal_yukawa_colloid.cu
	A			lib/gpu/lal_yukawa_colloid.cpp
	P			lib/gpu/lal_yukawa_colloid.cu Copied from lib/gpu/lal_yukawa.cu
	A			lib/gpu/lal_yukawa_colloid.h
	A			lib/gpu/lal_yukawa_colloid_ext.cpp
	M			src/GPU/Install.sh
	M			src/GPU/Package.sh
	M			src/GPU/fix_gpu.cpp
	A			src/GPU/pair_born_coul_long_gpu.cpp
	A			src/GPU/pair_born_coul_long_gpu.h
	A			src/GPU/pair_born_coul_wolf_gpu.cpp
	A			src/GPU/pair_born_coul_wolf_gpu.h
	A			src/GPU/pair_born_gpu.cpp
	A			src/GPU/pair_born_gpu.h
	A			src/GPU/pair_colloid_gpu.cpp
	A			src/GPU/pair_colloid_gpu.h
	A			src/GPU/pair_dipole_cut_gpu.cpp
	A			src/GPU/pair_dipole_cut_gpu.h
	A			src/GPU/pair_dipole_sf_gpu.cpp
	A			src/GPU/pair_dipole_sf_gpu.h
	A			src/GPU/pair_gauss_gpu.cpp
	A			src/GPU/pair_gauss_gpu.h
	A			src/GPU/pair_lj_cut_coul_debye_gpu.cpp
	A			src/GPU/pair_lj_cut_coul_debye_gpu.h
	A			src/GPU/pair_yukawa_colloid_gpu.cpp
	A			src/GPU/pair_yukawa_colloid_gpu.h
	M			src/GPU/pppm_gpu.cpp
	M			src/GPU/pppm_gpu.h
	M			src/domain.cpp