Merge branch 'master' into lammps-icms
5b051c4d3d36
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 6 2012, 21:21.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
lib/cuda/cuda_pair_kernel.cu
src/USER-CUDA/Install.sh
src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h
src/USER-CUDA/pair_lj_sdk_cuda.cpp
src/USER-CUDA/pair_lj_sdk_cuda.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 6 2012, 21:21

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS5d7feb1f6a15: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7914 f3b2605a-c512-4ea7…
rLAMMPS5be46b8ad932: update cutoff radii to more reasonable values

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS5b051c4d3d36: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 6 2012, 21:21

Merged Changes

Commit	Author	Details	Committed
5d7feb1f6a15	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7914 f3b2605a-c512-4ea7…	Mar 5 2012
42d468abfa1e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7913 f3b2605a-c512-4ea7…	Mar 5 2012
c450b92bf208	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7912 f3b2605a-c512-4ea7…	Mar 5 2012
5c8377356f27	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7910 f3b2605a-c512-4ea7…	Mar 5 2012
629f4d0adb9a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7909 f3b2605a-c512-4ea7…	Mar 5 2012
4672eeba1af3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7908 f3b2605a-c512-4ea7…	Mar 5 2012
61c4fa6ee0e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7907 f3b2605a-c512-4ea7…	Mar 5 2012
932f85ff2e24	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7906 f3b2605a-c512-4ea7…	Mar 5 2012
e769fb5b1e80	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7905 f3b2605a-c512-4ea7…	Mar 5 2012
5dbd664a202c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7904 f3b2605a-c512-4ea7…	Mar 5 2012
377cd52b2e98	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7903 f3b2605a-c512-4ea7…	Mar 5 2012

Changes (109)

		Path
M		doc/Section_packages.html
M		doc/Section_packages.txt
M		doc/improper_cvff.html
M		doc/improper_cvff.txt
M		lib/cuda/cuda_pair.cu
M		lib/cuda/cuda_pair_kernel.cu
V		lib/cuda/{pair_cg_cmm_coul_cut_cuda.cu → pair_lj_sdk_coul_cut_cuda.cu}
V		lib/cuda/{pair_cg_cmm_coul_cut_cuda_cu.h → pair_lj_sdk_coul_cut_cuda_cu.h}
V		lib/cuda/{pair_cg_cmm_coul_debye_cuda.cu → pair_lj_sdk_coul_debye_cuda.cu}
V		lib/cuda/{pair_cg_cmm_coul_debye_cuda_cu.h → pair_lj_sdk_coul_debye_cuda_cu.h}
V		lib/cuda/{pair_cg_cmm_coul_long_cuda.cu → pair_lj_sdk_coul_long_cuda.cu}
V		lib/cuda/{pair_cg_cmm_coul_long_cuda_cu.h → pair_lj_sdk_coul_long_cuda_cu.h}
V		lib/cuda/{pair_cg_cmm_cuda.cu → pair_lj_sdk_cuda.cu}
V		lib/cuda/{pair_cg_cmm_cuda_cu.h → pair_lj_sdk_cuda_cu.h}
V		lib/cuda/{pair_cg_cmm_cuda_kernel_nc.cu → pair_lj_sdk_cuda_kernel_nc.cu}
V		lib/cuda/{pair_lj_sdk_coul_cut_cuda.cu ← pair_cg_cmm_coul_cut_cuda.cu}
V		lib/cuda/{pair_lj_sdk_coul_cut_cuda_cu.h ← pair_cg_cmm_coul_cut_cuda_cu.h}
V		lib/cuda/{pair_lj_sdk_coul_debye_cuda.cu ← pair_cg_cmm_coul_debye_cuda.cu}
V		lib/cuda/{pair_lj_sdk_coul_debye_cuda_cu.h ← pair_cg_cmm_coul_debye_cuda_cu.h}
V		lib/cuda/{pair_lj_sdk_coul_long_cuda.cu ← pair_cg_cmm_coul_long_cuda.cu}
V		lib/cuda/{pair_lj_sdk_coul_long_cuda_cu.h ← pair_cg_cmm_coul_long_cuda_cu.h}
V		lib/cuda/{pair_lj_sdk_cuda.cu ← pair_cg_cmm_cuda.cu}
V		lib/cuda/{pair_lj_sdk_cuda_cu.h ← pair_cg_cmm_cuda_cu.h}
V		lib/cuda/{pair_lj_sdk_cuda_kernel_nc.cu ← pair_cg_cmm_cuda_kernel_nc.cu}
M		src/REPLICA/prd.cpp
M		src/REPLICA/tad.cpp
M		src/SHOCK/fix_append_atoms.cpp
P		src/USER-CUDA/pair_lj_sdk_coul_cut_cuda.cpp Copied from src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
P		src/USER-CUDA/pair_lj_sdk_coul_cut_cuda.h Copied from src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h
P		src/USER-CUDA/pair_lj_sdk_coul_debye_cuda.cpp Copied from src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
P		src/USER-CUDA/pair_lj_sdk_coul_debye_cuda.h Copied from src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h
P		src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp Copied to multiple locations: src/USER-CUDA/pair_lj_sdk_coul_cut_cuda.cpp src/USER-CUDA/pair_lj_sdk_coul_debye_cuda.cpp
P		src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h Copied to multiple locations: src/USER-CUDA/pair_lj_sdk_coul_cut_cuda.h src/USER-CUDA/pair_lj_sdk_coul_debye_cuda.h
M		src/USER-CUDA/pair_lj_sdk_cuda.cpp
M		src/USER-CUDA/pair_lj_sdk_cuda.h
M		src/USER-EWALDN/README
V		src/WINDOWS/{AWPMD.sln → LAMMPS.sln}
D		src/WINDOWS/AWPMD.vcproj
D		src/WINDOWS/LAMMPS-std-user.vcproj
D		src/WINDOWS/LAMMPS-std.vcproj
V		src/WINDOWS/{LAMMPS.sln ← AWPMD.sln}
M		src/WINDOWS/LAMMPS.vcproj
A		src/WINDOWS/LAMMPS.vsmacros
M		src/WINDOWS/README.txt
M		src/WINDOWS/STUBS.vcproj
M		src/WINDOWS/extra/sys/time.h
A	(dir)	src/WINDOWS/settings/
A		src/WINDOWS/settings/style_angle.h
A		src/WINDOWS/settings/style_atom.h
A		src/WINDOWS/settings/style_bond.h
A		src/WINDOWS/settings/style_command.h
A		src/WINDOWS/settings/style_compute.h
A		src/WINDOWS/settings/style_dihedral.h
A		src/WINDOWS/settings/style_dump.h
A		src/WINDOWS/settings/style_fix.h
A		src/WINDOWS/settings/style_improper.h
A		src/WINDOWS/settings/style_integrate.h
A		src/WINDOWS/settings/style_kspace.h
A		src/WINDOWS/settings/style_minimize.h
A		src/WINDOWS/settings/style_pair.h
A		src/WINDOWS/settings/style_region.h
D		src/WINDOWS/settings_awpmd
D		src/WINDOWS/settings_awpmd/style_angle.h
D		src/WINDOWS/settings_awpmd/style_atom.h
D		src/WINDOWS/settings_awpmd/style_bond.h
D		src/WINDOWS/settings_awpmd/style_command.h
D		src/WINDOWS/settings_awpmd/style_compute.h
D		src/WINDOWS/settings_awpmd/style_dihedral.h
D		src/WINDOWS/settings_awpmd/style_dump.h
D		src/WINDOWS/settings_awpmd/style_fix.h
D		src/WINDOWS/settings_awpmd/style_improper.h
D		src/WINDOWS/settings_awpmd/style_integrate.h
D		src/WINDOWS/settings_awpmd/style_kspace.h
D		src/WINDOWS/settings_awpmd/style_minimize.h
D		src/WINDOWS/settings_awpmd/style_pair.h
D		src/WINDOWS/settings_awpmd/style_region.h
D		src/WINDOWS/settings_default
D		src/WINDOWS/settings_default/style_angle.h
D		src/WINDOWS/settings_default/style_atom.h
D		src/WINDOWS/settings_default/style_bond.h
D		src/WINDOWS/settings_default/style_command.h
D		src/WINDOWS/settings_default/style_compute.h
D		src/WINDOWS/settings_default/style_dihedral.h
D		src/WINDOWS/settings_default/style_dump.h
D		src/WINDOWS/settings_default/style_fix.h
D		src/WINDOWS/settings_default/style_improper.h
D		src/WINDOWS/settings_default/style_integrate.h
D		src/WINDOWS/settings_default/style_kspace.h
D		src/WINDOWS/settings_default/style_minimize.h
D		src/WINDOWS/settings_default/style_pair.h
D		src/WINDOWS/settings_default/style_region.h
D		src/WINDOWS/settings_standard
D		src/WINDOWS/settings_standard/style_angle.h
D		src/WINDOWS/settings_standard/style_atom.h
D		src/WINDOWS/settings_standard/style_bond.h
D		src/WINDOWS/settings_standard/style_command.h
D		src/WINDOWS/settings_standard/style_compute.h
D		src/WINDOWS/settings_standard/style_dihedral.h
D		src/WINDOWS/settings_standard/style_dump.h
D		src/WINDOWS/settings_standard/style_fix.h
D		src/WINDOWS/settings_standard/style_improper.h
D		src/WINDOWS/settings_standard/style_integrate.h
D		src/WINDOWS/settings_standard/style_kspace.h
D		src/WINDOWS/settings_standard/style_minimize.h
D		src/WINDOWS/settings_standard/style_pair.h
D		src/WINDOWS/settings_standard/style_region.h
M		src/lmpwindows.h
M		src/procmap.cpp
M		src/version.h