Homec4science
Diffusion lammps b1bdd74f88ac

Merge branch 'master' into lammps-icms
b1bdd74f88ac
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 26 2012, 09:10.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/USER-CUDA/Install.sh
src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.h
src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.h
src/USER-CUDA/pair_cg_cmm_coul_long_cuda.cpp
src/USER-CUDA/pair_cg_cmm_coul_long_cuda.h
src/USER-CUDA/pair_cg_cmm_cuda.cpp
src/USER-CUDA/pair_cg_cmm_cuda.h
src/pair_lj_cut_coul_cut.h

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Jul 26 2012, 09:10
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS5e52200ad3a8: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8496 f3b2605a-c512-4ea7…
rLAMMPSec8e3ab3f247: Merge branch 'master' into lammps-icms
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSb1bdd74f88ac: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 26 2012, 09:10

Merged Changes

CommitAuthorDetailsCommitted
5e52200ad3a8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8496 f3b2605a-c512-4ea7… 
Jul 25 2012
93f70b4f0a52sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8495 f3b2605a-c512-4ea7… 
Jul 25 2012
5cd1f06da632sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8494 f3b2605a-c512-4ea7… 
Jul 25 2012
66f14edf6036sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8493 f3b2605a-c512-4ea7… 
Jul 24 2012
3d59bf016651sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8492 f3b2605a-c512-4ea7… 
Jul 24 2012
35e3d38972efsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8491 f3b2605a-c512-4ea7… 
Jul 24 2012
8b62babdddcfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8490 f3b2605a-c512-4ea7… 
Jul 24 2012

Changes (20)

Path
Adoc/Eqs/dihedral_sign.jpg
Mdoc/dihedral_coeff.html
Mdoc/dihedral_coeff.txt
Mdoc/dihedral_harmonic.html
Mdoc/dihedral_harmonic.txt
Mdoc/dihedral_style.html
Mdoc/dihedral_style.txt
Msrc/KSPACE/pair_lj_cut_coul_long.cpp
Msrc/USER-CG-CMM/Install.sh
Msrc/USER-CUDA/Install.sh
Dsrc/USER-CUDA/pair_cg_cmm_coul_cut_cuda.cpp
Dsrc/USER-CUDA/pair_cg_cmm_coul_cut_cuda.h
Dsrc/USER-CUDA/pair_cg_cmm_coul_debye_cuda.cpp
Dsrc/USER-CUDA/pair_cg_cmm_coul_debye_cuda.h
Dsrc/USER-CUDA/pair_cg_cmm_coul_long_cuda.cpp
Dsrc/USER-CUDA/pair_cg_cmm_coul_long_cuda.h
Dsrc/USER-CUDA/pair_cg_cmm_cuda.cpp
Dsrc/USER-CUDA/pair_cg_cmm_cuda.h
Msrc/pair_lj_cut_coul_cut.cpp
Msrc/pair_lj_cut_coul_cut.h

rLAMMPSb1bdd74f88ac

View Options

doc/Eqs/dihedral_sign.jpg

Loading...
View Options

doc/dihedral_coeff.html

Loading...
View Options

doc/dihedral_coeff.txt

Loading...
View Options

doc/dihedral_harmonic.html

Loading...
View Options

doc/dihedral_harmonic.txt

Loading...
View Options

doc/dihedral_style.html

Loading...
View Options

doc/dihedral_style.txt

Loading...
View Options

src/KSPACE/pair_lj_cut_coul_long.cpp

Loading...
View Options

src/USER-CG-CMM/Install.sh

Loading...
View Options

src/USER-CUDA/Install.sh

Loading...
View Options

src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.cpp

Loading...
View Options

src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.h

Loading...
View Options

src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.cpp

Loading...
View Options

src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.h

Loading...
View Options

src/USER-CUDA/pair_cg_cmm_coul_long_cuda.cpp

Loading...
View Options

src/USER-CUDA/pair_cg_cmm_coul_long_cuda.h

Loading...
View Options

src/USER-CUDA/pair_cg_cmm_cuda.cpp

Loading...
View Options

src/USER-CUDA/pair_cg_cmm_cuda.h

Loading...
View Options

src/pair_lj_cut_coul_cut.cpp

Loading...
View Options

src/pair_lj_cut_coul_cut.h

Loading...
c4science · Help