|
|
427161ef56
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/MAKE/Makefile.openmpi
src/min_linesearch.cpp
|
2013-01-09 07:09:35 -05:00 |
|
|
|
c8624bc7eb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9175 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-02 16:27:31 +00:00 |
|
|
|
87215c925c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9130 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-11-30 18:03:00 +00:00 |
|
|
|
198c2a9f71
|
update colvar module code to version of nov 20th
|
2012-11-28 10:43:07 -05:00 |
|
|
|
fdce177203
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8996 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-10-23 16:57:29 +00:00 |
|
|
|
e8aaeba77e
|
update colvars library to Oct 03 2012 version
|
2012-10-23 04:06:53 -04: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 |
|
|
|
209999068c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8810 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-09-21 15:57:23 +00:00 |
|
|
|
edeec7b788
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8763 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-09-11 13:57:57 +00:00 |
|
|
|
3d91565a48
|
Merge branch 'master' into lammps-icms
|
2012-09-11 05:01:19 -04:00 |
|
|
|
55497c21c0
|
fix compilation problem with gcc 4.7.x
|
2012-09-11 04:58:23 -04:00 |
|
|
|
dfb38392c9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8757 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-09-10 14:11:13 +00:00 |
|
|
|
49ceafd447
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8756 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-09-07 23:08:36 +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 |
|
|
|
c6552844ab
|
Merge branch 'master' into lammps-icms
|
2012-08-25 16:21:28 -04:00 |
|
|
|
0d36adc00b
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
lib/gpu/Nvidia.makefile
lib/gpu/Opencl.makefile
|
2012-08-23 11:58:10 -04:00 |
|
|
|
690a72edc7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8702 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-23 13:09:55 +00:00 |
|
|
|
81ec0e96e1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8701 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-23 13:09:47 +00:00 |
|
|
|
c81a8f1bc9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8699 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-23 13:03:38 +00:00 |
|
|
|
647ea4c29f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8694 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-21 13:59:15 +00:00 |
|
|
|
31551d81fd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8693 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-21 13:57:32 +00:00 |
|
|
|
d61136b1d0
|
Merge branch 'lammps-icms' into lammps-colvars
|
2012-08-18 17:19:18 -04:00 |
|
|
|
ffc41c52c5
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
lib/meam/Makefile.gfortran
lib/poems/Makefile.g++
lib/reax/Makefile.gfortran
python/lammps.py
src/USER-CUDA/cuda.cpp
|
2012-08-15 08:38:04 -04:00 |
|
|
|
7365c2cfe6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8648 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-14 14:22:56 +00:00 |
|
|
|
f2bade874d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8647 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-14 14:21:56 +00:00 |
|
|
|
e19e06952f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8646 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-14 14:20:55 +00:00 |
|
|
|
15a86b4bcd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8645 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-14 14:17:26 +00:00 |
|
|
|
533db03649
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8644 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-14 14:16:57 +00:00 |
|
|
|
1b8aa27fe5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8643 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-14 14:16:08 +00:00 |
|
|
|
14e3a6e2c9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8642 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-08-14 14:15:28 +00:00 |
|
|
|
b898d5d163
|
update colvarmodule code to svn as of aug 8 2012
|
2012-08-08 05:15:16 -04:00 |
|
|
|
4c70fbfd8b
|
Merge branch 'lammps-colvars' into lammps-icms
|
2012-08-03 05:40:39 -04:00 |
|
|
|
4bc860561c
|
some more cutomizations for libraries
|
2012-08-03 05:32:55 -04:00 |
|
|
|
fa5861bc2d
|
upgrade colvars module to july 17 2012 version
|
2012-08-03 05:15:34 -04:00 |
|
|
|
2a099bfedb
|
Merge branch 'master' into lammps-icms
Resolve Conflicts:
src/region.cpp
|
2012-06-30 11:23:32 -04:00 |
|
|
|
fee52f2fac
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8433 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-29 17:52:31 +00: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 |
|
|
|
e163a2f089
|
update colvars module with the latest version
|
2012-06-23 20:10:10 -04:00 |
|
|
|
5c64815a2a
|
Merge branch 'lammps-icms' into lammps-colvars
|
2012-06-23 20:06:23 -04:00 |
|
|
|
4441f9b5aa
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
doc/read_dump.txt
doc/rerun.txt
lib/molfile/README
src/MOLECULE/dihedral_helix.cpp
src/USER-MOLFILE/Install.sh
src/USER-MOLFILE/README
src/create_atoms.cpp
src/read_dump.cpp
src/reader.cpp
src/reader_xyz.cpp
src/rerun.cpp
|
2012-06-20 09:11:18 -04:00 |
|
|
|
d4c19826ba
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8336 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-19 19:45:47 +00:00 |
|
|
|
725578a978
|
Merge branch 'lammps-icms' into lammps-colvars
|
2012-06-15 14:37:42 -04:00 |
|
|
|
0fede4ae98
|
Merge branch 'lammps-icms' into lammps-molfile
Resolved Conflicts:
src/USER-MOLFILE/README
|
2012-06-14 10:40:36 -04:00 |
|
|
|
dd4f21087a
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/USER-MOLFILE/Install.sh
src/USER-MOLFILE/README
|
2012-06-14 08:56:45 -04:00 |
|
|
|
03967d2270
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8279 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-13 16:40:16 +00:00 |
|
|
|
49a004194c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8278 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2012-06-13 16:35:57 +00:00 |
|
