|
|
12dcd70461
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/colvars/colvar.cpp
lib/colvars/colvar.h
lib/colvars/colvaratoms.cpp
lib/colvars/colvarbias.cpp
lib/colvars/colvarbias.h
lib/colvars/colvarbias_abf.cpp
lib/colvars/colvarbias_abf.h
lib/colvars/colvarcomp.cpp
lib/colvars/colvarcomp.h
lib/colvars/colvarcomp_distances.cpp
lib/colvars/colvargrid.h
lib/colvars/colvarmodule.cpp
lib/colvars/colvarmodule.h
lib/colvars/colvarproxy.h
lib/colvars/colvartypes.h
lib/cuda/Makefile.lammps
src/USER-COLVARS/fix_colvars.cpp
|
2014-10-29 08:26:31 -04:00 |
|
|
|
7cea65198f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12649 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-28 15:21:46 +00:00 |
|
|
|
2f420c1e16
|
correct -lcufft location
|
2014-10-27 02:29:42 -04:00 |
|
|
|
20a71b1d23
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12640 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-21 16:50:00 +00:00 |
|
|
|
e2b364192b
|
update GPU related makefiles/settings for temple desktop
|
2014-10-13 19:58:26 -04:00 |
|
|
|
a05fa107d8
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.defaults
lib/cuda/Makefile.lammps
lib/cuda/pair_cg_cmm_coul_cut_cuda.cu
lib/cuda/pair_cg_cmm_coul_debye_cuda.cu
lib/cuda/pair_cg_cmm_coul_long_cuda.cu
lib/cuda/pair_cg_cmm_cuda.cu
lib/cuda/pair_cg_cmm_cuda_kernel_nc.cu
src/USER-FEP/fix_adapt_fep.cpp
src/molecule.cpp
|
2014-10-09 13:03:12 -04:00 |
|
|
|
69f2390b06
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12596 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-07 15:24:30 +00:00 |
|
|
|
7c748bb17f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12590 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-06 23:40:06 +00:00 |
|
|
|
621fa7d600
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12588 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-10-06 22:59:05 +00:00 |
|
|
|
4a95b00477
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12496 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-11 16:58:10 +00:00 |
|
|
|
4469e4e407
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
lib/cuda/Makefile.defaults
lib/cuda/Makefile.lammps
|
2014-09-05 13:19:51 +02:00 |
|
|
|
451d5c04ef
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12403 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-04 16:09:47 +00:00 |
|
|
|
af4909ab51
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12399 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-09-04 15:42:52 +00:00 |
|
|
|
bcec3c56e4
|
Merge branch 'patch_14_06_2014' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.lammps
src/pair.cpp
|
2014-06-15 13:25:09 +02:00 |
|
|
|
598be75009
|
anticipate 14 June 2014 patch
|
2014-06-15 13:19:31 +02:00 |
|
|
|
e88b2465e7
|
various little updates and local changes
|
2014-06-15 13:15:30 +02:00 |
|
|
|
2ec1442e97
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12132 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2014-06-14 19:34:19 +00:00 |
|
|
|
9adfd0cac1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10519 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-08-02 15:02:54 +00:00 |
|
|
|
a6ceede04a
|
implement a more portable version of the the clock_gettime workaround
|
2013-08-01 10:47:30 +02:00 |
|
|
|
c7e5039857
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10425 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-26 16:37:03 +00:00 |
|
|
|
d65b922bb2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10415 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-26 15:48:32 +00:00 |
|
|
|
1a4bead190
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10414 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-07-26 15:43:29 +00:00 |
|
|
|
434c695e39
|
re-instate Makefile.lammps
|
2013-07-26 11:40:02 +02:00 |
|
|
|
e6f6722365
|
make USER-CUDA compile with current LAMMPS-ICMS
|
2013-07-26 11:02:01 +02:00 |
|
|
|
c7183e199a
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.txt
lib/cuda/Makefile.lammps
src/MOLECULE/dihedral_charmm.cpp
src/pair.h
|
2013-06-29 13:25:29 +02:00 |
|
|
|
1cda7f63aa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10166 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-06-28 19:32:18 +00:00 |
|
|
|
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 |
|
