|
|
ce2b853e4a
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Eqs/pair_gauss.jpg
doc/Manual.txt
doc/pair_list.html
doc/pair_list.txt
lib/atc/Makefile.lammps.linalg
lib/awpmd/Makefile.lammps.linalg
lib/gpu/Makefile.lincoln
lib/linalg/Makefile.gfortran
lib/linalg/Makefile.mingw_cross
lib/linalg/README
lib/reax/Makefile.lammps
src/USER-CG-CMM/Install.sh
src/USER-COLVARS/Install.sh
src/USER-CUDA/Install.sh
src/USER-MISC/Install.sh
src/USER-MISC/pair_list.cpp
src/USER-OMP/Install.sh
src/USER-PHONON/Install.sh
|
2013-06-01 13:53:34 +02:00 |
|
|
|
e56c4a1358
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9981 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-05-30 20:34:41 +00:00 |
|
|
|
9a0e9670fb
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/Eqs/pair_gauss.jpg
lib/cuda/Makefile.common
lib/cuda/Makefile.defaults
lib/cuda/Makefile.lammps
lib/cuda/cuda_wrapper_cu.h
lib/cuda/pair_cg_cmm_coul_cut_cuda.cu
lib/cuda/pair_cg_cmm_coul_cut_cuda_cu.h
lib/cuda/pair_cg_cmm_coul_debye_cuda.cu
lib/cuda/pair_cg_cmm_coul_debye_cuda_cu.h
lib/cuda/pair_cg_cmm_coul_long_cuda.cu
lib/cuda/pair_cg_cmm_coul_long_cuda_cu.h
lib/cuda/pair_cg_cmm_cuda.cu
lib/cuda/pair_cg_cmm_cuda_cu.h
lib/cuda/pair_cg_cmm_cuda_kernel_nc.cu
|
2012-10-12 08:46:39 -04:00 |
|
|
|
6bbadce42d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8937 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-10 15:44:38 +00:00 |
|
|
|
14bcb1e6d0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8922 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-08 15:29:55 +00:00 |
|
|
|
856a237400
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8921 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-08 15:29:39 +00:00 |
|
|
|
4895715bdd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8904 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-04 14:58:13 +00:00 |
|
|
|
249f5349f0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8732 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-29 14:04:25 +00:00 |
|
|
|
2a099bfedb
|
Merge branch 'master' into lammps-icms
Resolve Conflicts:
src/region.cpp
|
2012-06-30 11:23:32 -04:00 |
|
|
|
9db45bcb92
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8419 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-27 23:15:46 +00:00 |
|
|
|
fffc66eef2
|
fix typo
|
2012-06-07 18:31:42 -04:00 |
|
|
|
9f1e6e5c77
|
reinstate full cg/cmm compatibility for USER-CUDA
|
2012-03-06 15:34:08 -05:00 |
|
|
|
5b051c4d3d
|
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
|
2012-03-06 15:21:43 -05:00 |
|
|
|
5dbd664a20
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7904 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-03-05 15:29:04 +00:00 |
|
|
|
377cd52b2e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7903 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-03-05 15:28:58 +00:00 |
|
|
|
cb8a8c9625
|
bugfixes from christian for USER-CUDA
|
2012-03-02 16:43:56 -05:00 |
|
|
|
172f6724d9
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp
src/OPT/pair_lj_cut_coul_long_tip4p_opt.cpp
src/USER-OMP/pair_lj_cut_coul_long_tip4p_omp.cpp
src/USER-OMP/pair_lj_cut_coul_pppm_tip4p_omp.cpp
|
2012-03-02 10:00:57 -05:00 |
|
|
|
1a7a009098
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7876 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-03-01 17:02:16 +00:00 |
|
|
|
53449d4375
|
adjust makefile default settings
|
2012-01-30 21:07:15 -05:00 |
|
|
|
860bca7d5e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7181 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-24 17:49:51 +00:00 |
|
|
|
8d409d8f2e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7162 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-20 15:42:19 +00:00 |
|
|
|
10a6791ea2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7142 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-20 14:33:50 +00:00 |
|
|
|
dcbe4d90ba
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7141 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-20 14:32:57 +00:00 |
|
|
|
1049b963d7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7140 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-20 14:32:41 +00:00 |
|
|
|
4591d9958d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7048 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-10-07 23:52:06 +00:00 |
|
|
|
1e7562efc2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6960 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-09-14 19:55:01 +00:00 |
|
|
|
f9b08962bd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6867 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-31 14:31:11 +00:00 |
|
|
|
a3a957195a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6763 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-23 20:58:36 +00:00 |
|
|
|
d22491de17
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6729 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-18 17:32:34 +00:00 |
|
|
|
3ef0f1d5d6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6728 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-18 17:32:18 +00:00 |
|
|
|
c80cc31a22
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6573 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-08-01 14:07:01 +00:00 |
|
|
|
472a7e2e5f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6453 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-20 16:43:12 +00:00 |
|
|
|
91240f781e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6363 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-06-10 23:25:04 +00:00 |
|
|
|
7af10d8e0f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6262 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2011-05-31 21:09:51 +00:00 |
|
