Diffusion lammps 47e2a3a5fc45

Merge branch 'master' into lammps-icms
47e2a3a5fc45
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 3 2012, 19:25.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/kspace_style.html
src/USER-EWALDN/ewald_n.h
src/USER-OMP/pppm_tip4p_omp.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 3 2012, 19:25

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS5fe50fbf26f4: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7895 f3b2605a-c512-4ea7…
rLAMMPS893928fe7c66: massive suffix cleanup, fix bug in bonded energy tally

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS47e2a3a5fc45: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 3 2012, 19:25

Merged Changes

Commit	Author	Details	Committed
5fe50fbf26f4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7895 f3b2605a-c512-4ea7…	Mar 2 2012
f68f04c8ee26	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7894 f3b2605a-c512-4ea7…	Mar 2 2012
38f66380d545	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7893 f3b2605a-c512-4ea7…	Mar 2 2012
21133ad922c9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7892 f3b2605a-c512-4ea7…	Mar 2 2012
4ba21107a120	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7891 f3b2605a-c512-4ea7…	Mar 2 2012
eab4d169d0e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7890 f3b2605a-c512-4ea7…	Mar 2 2012
986a987de81e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7889 f3b2605a-c512-4ea7…	Mar 2 2012
dfc2a9301a6e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7888 f3b2605a-c512-4ea7…	Mar 2 2012
bbe7dca1f2c2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7887 f3b2605a-c512-4ea7…	Mar 2 2012
267bb1ba8801	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7886 f3b2605a-c512-4ea7…	Mar 2 2012
d30ba2d7eb64	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7885 f3b2605a-c512-4ea7…	Mar 2 2012
17091c755e54	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7884 f3b2605a-c512-4ea7…	Mar 2 2012
b2ccacbdc010	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7883 f3b2605a-c512-4ea7…	Mar 2 2012
87050548197c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7882 f3b2605a-c512-4ea7…	Mar 2 2012
4deb839d4b33	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7881 f3b2605a-c512-4ea7…	Mar 2 2012

Changes (75)

				Path
	M			doc/Section_commands.html
	M			doc/Section_errors.html
	M			doc/Section_errors.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	M			doc/pair_beck.html
	M			doc/pair_meam_spline.html
	M			examples/kim/in.kim.lj
	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/lal_device.cpp
	M			lib/gpu/lal_eam.cpp
	M			lib/gpu/lal_neighbor.cpp
	M			lib/gpu/lal_neighbor.h
	M			lib/gpu/lal_neighbor_gpu.cu
	M			src/GPU/gpu_extra.h
	M			src/GPU/pair_buck_coul_cut_gpu.cpp
	M			src/GPU/pair_buck_coul_cut_gpu.h
	M			src/GPU/pair_buck_coul_long_gpu.cpp
	M			src/GPU/pair_buck_coul_long_gpu.h
	M			src/GPU/pair_buck_gpu.cpp
	M			src/GPU/pair_buck_gpu.h
	M			src/GPU/pair_coul_long_gpu.cpp
	M			src/GPU/pair_coul_long_gpu.h
	M			src/GPU/pair_eam_gpu.cpp
	M			src/GPU/pair_eam_gpu.h
	M			src/GPU/pair_gayberne_gpu.cpp
	M			src/GPU/pair_gayberne_gpu.h
	M			src/GPU/pair_lj96_cut_gpu.cpp
	M			src/GPU/pair_lj96_cut_gpu.h
	M			src/GPU/pair_lj_charmm_coul_long_gpu.cpp
	M			src/GPU/pair_lj_charmm_coul_long_gpu.h
	M			src/GPU/pair_lj_class2_coul_long_gpu.cpp
	M			src/GPU/pair_lj_class2_coul_long_gpu.h
	M			src/GPU/pair_lj_class2_gpu.cpp
	M			src/GPU/pair_lj_class2_gpu.h
	M			src/GPU/pair_lj_cut_coul_cut_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_cut_gpu.h
	M			src/GPU/pair_lj_cut_coul_long_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_long_gpu.h
	M			src/GPU/pair_lj_cut_gpu.cpp
	M			src/GPU/pair_lj_cut_gpu.h
	M			src/GPU/pair_lj_expand_gpu.cpp
	M			src/GPU/pair_lj_expand_gpu.h
	M			src/GPU/pair_lj_sdk_coul_long_gpu.cpp
	M			src/GPU/pair_lj_sdk_coul_long_gpu.h
	M			src/GPU/pair_lj_sdk_gpu.cpp
	M			src/GPU/pair_lj_sdk_gpu.h
	M			src/GPU/pair_morse_gpu.cpp
	M			src/GPU/pair_morse_gpu.h
	M			src/GPU/pair_resquared_gpu.cpp
	M			src/GPU/pair_resquared_gpu.h
	M			src/GPU/pair_table_gpu.cpp
	M			src/GPU/pair_table_gpu.h
	M			src/GPU/pair_yukawa_gpu.cpp
	M			src/GPU/pair_yukawa_gpu.h
	M			src/GPU/pppm_gpu.cpp
	M			src/GPU/pppm_gpu.h
	M			src/KIM/pair_kim.cpp
	M			src/KIM/pair_kim.h
	M			src/MC/fix_gcmc.h
	M			src/USER-EWALDN/Install.sh
	M			src/USER-EWALDN/ewald_n.cpp
	M			src/USER-EWALDN/ewald_n.h
	M			src/USER-EWALDN/pair_buck_coul.cpp
	M			src/USER-EWALDN/pair_lj_coul.cpp
	M			src/atom.cpp
	M			src/atom_vec.cpp
	M			src/atom_vec.h
	M			src/compute_erotate_sphere.h
	M			src/input.h
	M			src/pair_beck.h
	M			src/version.h