Diffusion lammps 2da0db319c38

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
2da0db319c38
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 24 2013, 12:35.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 24 2013, 12:35

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS0bc8b2679557: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10693 f3b2605a-c512-4ea7…
rLAMMPS1ca6fb0f8160: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2da0db319c38: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 24 2013, 12:35

Merged Changes

Commit	Author	Details	Committed
0bc8b2679557	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10693 f3b2605a-c512-4ea7…	Aug 23 2013
eba9eeccbec7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10691 f3b2605a-c512-4ea7…	Aug 23 2013
f0cf22dae7e8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10690 f3b2605a-c512-4ea7…	Aug 23 2013
ce49c35fda45	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10688 f3b2605a-c512-4ea7…	Aug 23 2013
1f9e81471bf1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10687 f3b2605a-c512-4ea7…	Aug 23 2013
1e51172f944a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10686 f3b2605a-c512-4ea7…	Aug 23 2013
1038042234f3	rjones	uncomment build/benchmark	Aug 23 2013
e5e09710b54c	rjones	update for remote mailing	Aug 23 2013
fd7fb4d28d83	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10682 f3b2605a-c512-4ea7…	Aug 23 2013
6bb11c07e3fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10680 f3b2605a-c512-4ea7…	Aug 23 2013
da563803b9b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10678 f3b2605a-c512-4ea7…	Aug 23 2013
839ff035f20a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10677 f3b2605a-c512-4ea7…	Aug 23 2013
52ec65d466ab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10676 f3b2605a-c512-4ea7…	Aug 23 2013
a9230abf54e4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10675 f3b2605a-c512-4ea7…	Aug 23 2013
6f8eeea3b370	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10674 f3b2605a-c512-4ea7…	Aug 23 2013
e8110de88d2d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10673 f3b2605a-c512-4ea7…	Aug 23 2013
550e3eae7a70	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10672 f3b2605a-c512-4ea7…	Aug 23 2013
f9da72a92ced	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10671 f3b2605a-c512-4ea7…	Aug 23 2013
6ad1c9618b98	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10670 f3b2605a-c512-4ea7…	Aug 23 2013
205833eaadb9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10669 f3b2605a-c512-4ea7…	Aug 23 2013
22751a2aaef2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10668 f3b2605a-c512-4ea7…	Aug 23 2013
402d1a8605fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10667 f3b2605a-c512-4ea7…	Aug 23 2013
404728823819	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10665 f3b2605a-c512-4ea7…	Aug 23 2013
88111796f535	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10664 f3b2605a-c512-4ea7…	Aug 23 2013
2ea115cfc2ec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10663 f3b2605a-c512-4ea7…	Aug 23 2013
f143f1a5465d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10662 f3b2605a-c512-4ea7…	Aug 23 2013
0bf07f466d6c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10661 f3b2605a-c512-4ea7…	Aug 23 2013
9e6e3ea34439	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10660 f3b2605a-c512-4ea7…	Aug 23 2013

Changes (177)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	A			doc/Eqs/fix_wall_lj1043.jpg
	A			doc/Eqs/fix_wall_lj1043.tex
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	A			doc/compute_msd_nongauss.html
	A			doc/compute_msd_nongauss.txt
	M			doc/fix_wall.html
	M			doc/fix_wall.txt
	M			doc/package.html
	M			doc/package.txt
	M			doc/pair_beck.html
	M			doc/pair_beck.txt
	M			doc/pair_dpd.html
	M			doc/pair_dpd.txt
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	M			doc/pair_mie.html
	M			doc/pair_mie.txt
	M			doc/pair_soft.html
	M			doc/pair_soft.txt
	M			doc/pair_sw.html
	M			doc/pair_sw.txt
	A			lib/gpu/Makefile.lammps.mac_ocl
	A			lib/gpu/Makefile.lammps.opencl
	M			lib/gpu/Makefile.linux_opencl
	M			lib/gpu/Makefile.mac_opencl
	M			lib/gpu/Nvidia.makefile
	M			lib/gpu/Opencl.makefile
	M			lib/gpu/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_memory.h
	M			lib/gpu/geryon/ocl_device.h
	M			lib/gpu/geryon/ocl_kernel.h
	M			lib/gpu/geryon/ocl_memory.h
	M			lib/gpu/geryon/ocl_timer.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_h_mat.h
	M			lib/gpu/geryon/ucl_h_vec.h
	M			lib/gpu/geryon/ucl_matrix.h
	M			lib/gpu/geryon/ucl_s_obj_help.h
	M			lib/gpu/geryon/ucl_types.h
	M			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_aux_fun1.h
	P			lib/gpu/lal_base_atomic.cpp Copied to lib/gpu/lal_base_three.cpp
	M			lib/gpu/lal_base_charge.cpp
	M			lib/gpu/lal_base_dipole.cpp
	M			lib/gpu/lal_base_ellipsoid.cpp
	P			lib/gpu/lal_base_three.cpp Copied from lib/gpu/lal_base_atomic.cpp
	A			lib/gpu/lal_base_three.h
	P			lib/gpu/lal_beck.cpp Copied from lib/gpu/lal_gauss.cpp
	P			lib/gpu/lal_beck.cu Copied from lib/gpu/lal_buck.cu
	A			lib/gpu/lal_beck.h
	A			lib/gpu/lal_beck_ext.cpp
	M			lib/gpu/lal_born.cpp
	M			lib/gpu/lal_born.cu
	M			lib/gpu/lal_born_coul_long.cpp
	M			lib/gpu/lal_born_coul_long.cu
	M			lib/gpu/lal_born_coul_wolf.cpp
	M			lib/gpu/lal_born_coul_wolf.cu
	M			lib/gpu/lal_buck.cpp
	P			lib/gpu/lal_buck.cu Copied to lib/gpu/lal_beck.cu
	M			lib/gpu/lal_buck_coul.cpp
	M			lib/gpu/lal_buck_coul.cu
	M			lib/gpu/lal_buck_coul_long.cpp
	M			lib/gpu/lal_buck_coul_long.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
	M			lib/gpu/lal_colloid.cpp
	M			lib/gpu/lal_colloid.cu
	M			lib/gpu/lal_coul_dsf.cpp
	M			lib/gpu/lal_coul_dsf.cu
	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
	M			lib/gpu/lal_dipole_lj.cpp
	M			lib/gpu/lal_dipole_lj.cu
	M			lib/gpu/lal_dipole_lj_sf.cpp
	M			lib/gpu/lal_dipole_lj_sf.cu
	M			lib/gpu/lal_eam.cpp
	M			lib/gpu/lal_eam.cu
	M			lib/gpu/lal_ellipsoid_extra.h
	P			lib/gpu/lal_gauss.cpp Copied to multiple locations: lib/gpu/lal_beck.cpp lib/gpu/lal_mie.cpp lib/gpu/lal_soft.cpp
	P			lib/gpu/lal_gauss.cu Copied to lib/gpu/lal_mie.cu
	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
	P			lib/gpu/lal_lj96.cu Copied to lib/gpu/lal_soft.cu
	M			lib/gpu/lal_lj_class2_long.cpp
	M			lib/gpu/lal_lj_class2_long.cu
	M			lib/gpu/lal_lj_coul.cpp
	M			lib/gpu/lal_lj_coul.cu
	M			lib/gpu/lal_lj_coul_debye.cpp
	M			lib/gpu/lal_lj_coul_debye.cu
	P			lib/gpu/lal_lj_coul_long.cpp Copied to lib/gpu/lal_lj_coul_msm.cpp
	P			lib/gpu/lal_lj_coul_long.cu Copied to lib/gpu/lal_lj_coul_msm.cu
	P			lib/gpu/lal_lj_coul_msm.cpp Copied from lib/gpu/lal_lj_coul_long.cpp
	P			lib/gpu/lal_lj_coul_msm.cu Copied from lib/gpu/lal_lj_coul_long.cu
	A			lib/gpu/lal_lj_coul_msm.h
	A			lib/gpu/lal_lj_coul_msm_ext.cpp
	M			lib/gpu/lal_lj_dsf.cpp
	M			lib/gpu/lal_lj_dsf.cu
	M			lib/gpu/lal_lj_expand.cpp
	M			lib/gpu/lal_lj_expand.cu
	P			lib/gpu/lal_mie.cpp Copied from lib/gpu/lal_gauss.cpp
	P			lib/gpu/lal_mie.cu Copied from lib/gpu/lal_gauss.cu
	A			lib/gpu/lal_mie.h
	A			lib/gpu/lal_mie_ext.cpp
	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_shared.cpp
	M			lib/gpu/lal_neighbor_shared.h
	M			lib/gpu/lal_pppm.cpp
	M			lib/gpu/lal_pppm_ext.cpp
	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
	P			lib/gpu/lal_soft.cpp Copied from lib/gpu/lal_gauss.cpp
	P			lib/gpu/lal_soft.cu Copied from lib/gpu/lal_lj96.cu
	A			lib/gpu/lal_soft.h
	A			lib/gpu/lal_soft_ext.cpp
	A			lib/gpu/lal_sw.cpp
	A			lib/gpu/lal_sw.cu
	A			lib/gpu/lal_sw.h
	A			lib/gpu/lal_sw_ext.cpp
	M			lib/gpu/lal_table.cpp
	M			lib/gpu/lal_table.cu
	M			lib/gpu/lal_yukawa.cpp
	M			lib/gpu/lal_yukawa.cu
	M			lib/gpu/lal_yukawa_colloid.cpp
	M			lib/gpu/lal_yukawa_colloid.cu
	M			lib/gpu/lal_yukawa_colloid.h
	M			regress/regression.sh
	M			src/GPU/Install.sh
	M			src/GPU/fix_gpu.cpp
	M			src/GPU/gpu_extra.h
	A			src/GPU/pair_beck_gpu.cpp
	A			src/GPU/pair_beck_gpu.h
	A			src/GPU/pair_lj_cut_coul_msm_gpu.cpp
	A			src/GPU/pair_lj_cut_coul_msm_gpu.h
	A			src/GPU/pair_mie_cut_gpu.cpp
	A			src/GPU/pair_mie_cut_gpu.h
	A			src/GPU/pair_soft_gpu.cpp
	A			src/GPU/pair_soft_gpu.h
	A			src/GPU/pair_sw_gpu.cpp
	A			src/GPU/pair_sw_gpu.h
	M			src/GPU/pppm_gpu.cpp
	M			src/MANYBODY/pair_sw.h
	M			src/change_box.cpp
	A			src/fix_wall_lj1043.cpp
	A			src/fix_wall_lj1043.h
	M			src/kspace.h
	M			src/pair.cpp
	M			src/version.h
	D			tools/msi2lmp/biosym_frc_files
	D			tools/msi2lmp/biosym_frc_files/oplsaa.frc