Homec4science
Diffusion lammps 5b051c4d3d36

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
jungeOct 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

CommitAuthorDetailsCommitted
5d7feb1f6a15sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7914 f3b2605a-c512-4ea7… 
Mar 5 2012
42d468abfa1esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7913 f3b2605a-c512-4ea7… 
Mar 5 2012
c450b92bf208sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7912 f3b2605a-c512-4ea7… 
Mar 5 2012
5c8377356f27sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7910 f3b2605a-c512-4ea7… 
Mar 5 2012
629f4d0adb9asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7909 f3b2605a-c512-4ea7… 
Mar 5 2012
4672eeba1af3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7908 f3b2605a-c512-4ea7… 
Mar 5 2012
61c4fa6ee0e0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7907 f3b2605a-c512-4ea7… 
Mar 5 2012
932f85ff2e24sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7906 f3b2605a-c512-4ea7… 
Mar 5 2012
e769fb5b1e80sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7905 f3b2605a-c512-4ea7… 
Mar 5 2012
5dbd664a202csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7904 f3b2605a-c512-4ea7… 
Mar 5 2012
377cd52b2e98sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7903 f3b2605a-c512-4ea7… 
Mar 5 2012

Changes (109)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.
Path
Mdoc/Section_packages.html
Mdoc/Section_packages.txt
Mdoc/improper_cvff.html
Mdoc/improper_cvff.txt
Mlib/cuda/cuda_pair.cu
Mlib/cuda/cuda_pair_kernel.cu
Vlib/cuda/{pair_cg_cmm_coul_cut_cuda.cu → pair_lj_sdk_coul_cut_cuda.cu}
Vlib/cuda/{pair_cg_cmm_coul_cut_cuda_cu.h → pair_lj_sdk_coul_cut_cuda_cu.h}
Vlib/cuda/{pair_cg_cmm_coul_debye_cuda.cu → pair_lj_sdk_coul_debye_cuda.cu}
Vlib/cuda/{pair_cg_cmm_coul_debye_cuda_cu.h → pair_lj_sdk_coul_debye_cuda_cu.h}
Vlib/cuda/{pair_cg_cmm_coul_long_cuda.cu → pair_lj_sdk_coul_long_cuda.cu}
Vlib/cuda/{pair_cg_cmm_coul_long_cuda_cu.h → pair_lj_sdk_coul_long_cuda_cu.h}
Vlib/cuda/{pair_cg_cmm_cuda.cu → pair_lj_sdk_cuda.cu}
Vlib/cuda/{pair_cg_cmm_cuda_cu.h → pair_lj_sdk_cuda_cu.h}
Vlib/cuda/{pair_cg_cmm_cuda_kernel_nc.cu → pair_lj_sdk_cuda_kernel_nc.cu}
Vlib/cuda/{pair_lj_sdk_coul_cut_cuda.cu ← pair_cg_cmm_coul_cut_cuda.cu}
Vlib/cuda/{pair_lj_sdk_coul_cut_cuda_cu.h ← pair_cg_cmm_coul_cut_cuda_cu.h}
Vlib/cuda/{pair_lj_sdk_coul_debye_cuda.cu ← pair_cg_cmm_coul_debye_cuda.cu}
Vlib/cuda/{pair_lj_sdk_coul_debye_cuda_cu.h ← pair_cg_cmm_coul_debye_cuda_cu.h}
Vlib/cuda/{pair_lj_sdk_coul_long_cuda.cu ← pair_cg_cmm_coul_long_cuda.cu}
Vlib/cuda/{pair_lj_sdk_coul_long_cuda_cu.h ← pair_cg_cmm_coul_long_cuda_cu.h}
Vlib/cuda/{pair_lj_sdk_cuda.cu ← pair_cg_cmm_cuda.cu}
Vlib/cuda/{pair_lj_sdk_cuda_cu.h ← pair_cg_cmm_cuda_cu.h}
Vlib/cuda/{pair_lj_sdk_cuda_kernel_nc.cu ← pair_cg_cmm_cuda_kernel_nc.cu}
Msrc/REPLICA/prd.cpp
Msrc/REPLICA/tad.cpp
Msrc/SHOCK/fix_append_atoms.cpp
Psrc/USER-CUDA/pair_lj_sdk_coul_cut_cuda.cpp
Copied from src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
Psrc/USER-CUDA/pair_lj_sdk_coul_cut_cuda.h
Copied from src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h
Psrc/USER-CUDA/pair_lj_sdk_coul_debye_cuda.cpp
Copied from src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
Psrc/USER-CUDA/pair_lj_sdk_coul_debye_cuda.h
Copied from src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h
Psrc/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
Psrc/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
Msrc/USER-CUDA/pair_lj_sdk_cuda.cpp
Msrc/USER-CUDA/pair_lj_sdk_cuda.h
Msrc/USER-EWALDN/README
Vsrc/WINDOWS/{AWPMD.sln → LAMMPS.sln}
Dsrc/WINDOWS/AWPMD.vcproj
Dsrc/WINDOWS/LAMMPS-std-user.vcproj
Dsrc/WINDOWS/LAMMPS-std.vcproj
Vsrc/WINDOWS/{LAMMPS.sln ← AWPMD.sln}
Msrc/WINDOWS/LAMMPS.vcproj
Asrc/WINDOWS/LAMMPS.vsmacros
Msrc/WINDOWS/README.txt
Msrc/WINDOWS/STUBS.vcproj
Msrc/WINDOWS/extra/sys/time.h
A(dir)src/WINDOWS/settings/
Asrc/WINDOWS/settings/style_angle.h
Asrc/WINDOWS/settings/style_atom.h
Asrc/WINDOWS/settings/style_bond.h
Asrc/WINDOWS/settings/style_command.h
Asrc/WINDOWS/settings/style_compute.h
Asrc/WINDOWS/settings/style_dihedral.h
Asrc/WINDOWS/settings/style_dump.h
Asrc/WINDOWS/settings/style_fix.h
Asrc/WINDOWS/settings/style_improper.h
Asrc/WINDOWS/settings/style_integrate.h
Asrc/WINDOWS/settings/style_kspace.h
Asrc/WINDOWS/settings/style_minimize.h
Asrc/WINDOWS/settings/style_pair.h
Asrc/WINDOWS/settings/style_region.h
Dsrc/WINDOWS/settings_awpmd
Dsrc/WINDOWS/settings_awpmd/style_angle.h
Dsrc/WINDOWS/settings_awpmd/style_atom.h
Dsrc/WINDOWS/settings_awpmd/style_bond.h
Dsrc/WINDOWS/settings_awpmd/style_command.h
Dsrc/WINDOWS/settings_awpmd/style_compute.h
Dsrc/WINDOWS/settings_awpmd/style_dihedral.h
Dsrc/WINDOWS/settings_awpmd/style_dump.h
Dsrc/WINDOWS/settings_awpmd/style_fix.h
Dsrc/WINDOWS/settings_awpmd/style_improper.h
Dsrc/WINDOWS/settings_awpmd/style_integrate.h
Dsrc/WINDOWS/settings_awpmd/style_kspace.h
Dsrc/WINDOWS/settings_awpmd/style_minimize.h
Dsrc/WINDOWS/settings_awpmd/style_pair.h
Dsrc/WINDOWS/settings_awpmd/style_region.h
Dsrc/WINDOWS/settings_default
Dsrc/WINDOWS/settings_default/style_angle.h
Dsrc/WINDOWS/settings_default/style_atom.h
Dsrc/WINDOWS/settings_default/style_bond.h
Dsrc/WINDOWS/settings_default/style_command.h
Dsrc/WINDOWS/settings_default/style_compute.h
Dsrc/WINDOWS/settings_default/style_dihedral.h
Dsrc/WINDOWS/settings_default/style_dump.h
Dsrc/WINDOWS/settings_default/style_fix.h
Dsrc/WINDOWS/settings_default/style_improper.h
Dsrc/WINDOWS/settings_default/style_integrate.h
Dsrc/WINDOWS/settings_default/style_kspace.h
Dsrc/WINDOWS/settings_default/style_minimize.h
Dsrc/WINDOWS/settings_default/style_pair.h
Dsrc/WINDOWS/settings_default/style_region.h
Dsrc/WINDOWS/settings_standard
Dsrc/WINDOWS/settings_standard/style_angle.h
Dsrc/WINDOWS/settings_standard/style_atom.h
Dsrc/WINDOWS/settings_standard/style_bond.h
Dsrc/WINDOWS/settings_standard/style_command.h
Dsrc/WINDOWS/settings_standard/style_compute.h
Dsrc/WINDOWS/settings_standard/style_dihedral.h
Dsrc/WINDOWS/settings_standard/style_dump.h
Dsrc/WINDOWS/settings_standard/style_fix.h
Dsrc/WINDOWS/settings_standard/style_improper.h
Dsrc/WINDOWS/settings_standard/style_integrate.h
Dsrc/WINDOWS/settings_standard/style_kspace.h
Dsrc/WINDOWS/settings_standard/style_minimize.h
Dsrc/WINDOWS/settings_standard/style_pair.h
Dsrc/WINDOWS/settings_standard/style_region.h
Msrc/lmpwindows.h
Msrc/procmap.cpp
Msrc/version.h

rLAMMPS5b051c4d3d36

View Options

doc/Section_packages.html

View Options

doc/Section_packages.txt

View Options

doc/improper_cvff.html

View Options

doc/improper_cvff.txt

View Options

lib/cuda/cuda_pair.cu

View Options

lib/cuda/cuda_pair_kernel.cu

View Options

lib/cuda/pair_cg_cmm_coul_cut_cuda.cu

View Options

lib/cuda/pair_cg_cmm_coul_cut_cuda_cu.h

View Options

lib/cuda/pair_cg_cmm_coul_debye_cuda.cu

View Options

lib/cuda/pair_cg_cmm_coul_debye_cuda_cu.h

View Options

lib/cuda/pair_cg_cmm_coul_long_cuda.cu

View Options

lib/cuda/pair_cg_cmm_coul_long_cuda_cu.h

View Options

lib/cuda/pair_cg_cmm_cuda.cu

View Options

lib/cuda/pair_cg_cmm_cuda_cu.h

View Options

lib/cuda/pair_cg_cmm_cuda_kernel_nc.cu

View Options

lib/cuda/pair_lj_sdk_coul_cut_cuda.cu

View Options

lib/cuda/pair_lj_sdk_coul_cut_cuda_cu.h

View Options

lib/cuda/pair_lj_sdk_coul_debye_cuda.cu

View Options

lib/cuda/pair_lj_sdk_coul_debye_cuda_cu.h

View Options

lib/cuda/pair_lj_sdk_coul_long_cuda.cu

View Options

lib/cuda/pair_lj_sdk_coul_long_cuda_cu.h

View Options

lib/cuda/pair_lj_sdk_cuda.cu

View Options

lib/cuda/pair_lj_sdk_cuda_cu.h

View Options

lib/cuda/pair_lj_sdk_cuda_kernel_nc.cu

View Options

src/REPLICA/prd.cpp

View Options

src/REPLICA/tad.cpp

View Options

src/SHOCK/fix_append_atoms.cpp

View Options

src/USER-CUDA/pair_lj_sdk_coul_cut_cuda.cpp

View Options

src/USER-CUDA/pair_lj_sdk_coul_cut_cuda.h

View Options

src/USER-CUDA/pair_lj_sdk_coul_debye_cuda.cpp

View Options

src/USER-CUDA/pair_lj_sdk_coul_debye_cuda.h

View Options

src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp

View Options

src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h

View Options

src/USER-CUDA/pair_lj_sdk_cuda.cpp

View Options

src/USER-CUDA/pair_lj_sdk_cuda.h

View Options

src/USER-EWALDN/README

View Options

src/WINDOWS/AWPMD.sln

View Options

src/WINDOWS/AWPMD.vcproj

View Options

src/WINDOWS/LAMMPS-std-user.vcproj

View Options

src/WINDOWS/LAMMPS-std.vcproj

View Options

src/WINDOWS/LAMMPS.sln

View Options

src/WINDOWS/LAMMPS.vcproj

View Options

src/WINDOWS/LAMMPS.vsmacros

View Options

src/WINDOWS/README.txt

View Options

src/WINDOWS/STUBS.vcproj

View Options

src/WINDOWS/extra/sys/time.h

View Options

src/WINDOWS/settings/style_angle.h

View Options

src/WINDOWS/settings/style_atom.h

View Options

src/WINDOWS/settings/style_bond.h

View Options

src/WINDOWS/settings/style_command.h

View Options

src/WINDOWS/settings/style_compute.h

View Options

src/WINDOWS/settings/style_dihedral.h

View Options

src/WINDOWS/settings/style_dump.h

View Options

src/WINDOWS/settings/style_fix.h

View Options

src/WINDOWS/settings/style_improper.h

View Options

src/WINDOWS/settings/style_integrate.h

View Options

src/WINDOWS/settings/style_kspace.h

View Options

src/WINDOWS/settings/style_minimize.h

View Options

src/WINDOWS/settings/style_pair.h

View Options

src/WINDOWS/settings/style_region.h

View Options

src/WINDOWS/settings_awpmd

View Options

src/WINDOWS/settings_awpmd/style_angle.h

View Options

src/WINDOWS/settings_awpmd/style_atom.h

View Options

src/WINDOWS/settings_awpmd/style_bond.h

View Options

src/WINDOWS/settings_awpmd/style_command.h

View Options

src/WINDOWS/settings_awpmd/style_compute.h

View Options

src/WINDOWS/settings_awpmd/style_dihedral.h

View Options

src/WINDOWS/settings_awpmd/style_dump.h

View Options

src/WINDOWS/settings_awpmd/style_fix.h

View Options

src/WINDOWS/settings_awpmd/style_improper.h

View Options

src/WINDOWS/settings_awpmd/style_integrate.h

View Options

src/WINDOWS/settings_awpmd/style_kspace.h

View Options

src/WINDOWS/settings_awpmd/style_minimize.h

View Options

src/WINDOWS/settings_awpmd/style_pair.h

View Options

src/WINDOWS/settings_awpmd/style_region.h

View Options

src/WINDOWS/settings_default

View Options

src/WINDOWS/settings_default/style_angle.h

View Options

src/WINDOWS/settings_default/style_atom.h

View Options

src/WINDOWS/settings_default/style_bond.h

View Options

src/WINDOWS/settings_default/style_command.h

View Options

src/WINDOWS/settings_default/style_compute.h

View Options

src/WINDOWS/settings_default/style_dihedral.h

View Options

src/WINDOWS/settings_default/style_dump.h

View Options

src/WINDOWS/settings_default/style_fix.h

View Options

src/WINDOWS/settings_default/style_improper.h

View Options

src/WINDOWS/settings_default/style_integrate.h

View Options

src/WINDOWS/settings_default/style_kspace.h

View Options

src/WINDOWS/settings_default/style_minimize.h

View Options

src/WINDOWS/settings_default/style_pair.h

View Options

src/WINDOWS/settings_default/style_region.h

View Options

src/WINDOWS/settings_standard

View Options

src/WINDOWS/settings_standard/style_angle.h

View Options

src/WINDOWS/settings_standard/style_atom.h

View Options

src/WINDOWS/settings_standard/style_bond.h

View Options

src/WINDOWS/settings_standard/style_command.h

View Options

src/WINDOWS/settings_standard/style_compute.h

View Options

src/WINDOWS/settings_standard/style_dihedral.h

View Options

src/WINDOWS/settings_standard/style_dump.h

View Options

src/WINDOWS/settings_standard/style_fix.h

View Options

src/WINDOWS/settings_standard/style_improper.h

View Options

src/WINDOWS/settings_standard/style_integrate.h

View Options

src/WINDOWS/settings_standard/style_kspace.h

View Options

src/WINDOWS/settings_standard/style_minimize.h

View Options

src/WINDOWS/settings_standard/style_pair.h

View Options

src/WINDOWS/settings_standard/style_region.h

View Options

src/lmpwindows.h

View Options

src/procmap.cpp

c4science · Help