|
|
f43a004f01
|
update colvars module with support for index files
|
2013-05-15 15:17:47 +02:00 |
|
|
|
c191cb296b
|
Merge branch 'compilation-bugfix' into lammps-icms
Resolved Conflicts:
lib/atc/Makefile.lammps
lib/awpmd/Makefile.lammps
|
2013-05-15 14:26:23 +02:00 |
|
|
|
3929d2bd1d
|
preconfigure ATC and AWPMD to use internal BLAS/LAPACK
|
2013-05-15 14:21:33 +02:00 |
|
|
|
d647835187
|
update makefile to include README
|
2013-05-15 12:08:18 +02:00 |
|
|
|
d4f1e9535f
|
update README for liblinalg
|
2013-05-15 12:03:14 +02:00 |
|
|
|
22c9c3b390
|
update to LAPACK 3.4.2, update Makefile
|
2013-05-15 11:57:25 +02:00 |
|
|
|
559c814273
|
update local blas/lapack copy with additional files needed for awpmd update to lapack 3.2.2
|
2013-05-15 11:28:34 +02:00 |
|
|
|
53bb83bb33
|
make atc and awpmd use the local blas/lapack by default
|
2013-05-15 11:27:05 +02:00 |
|
|
|
16cd5d0088
|
update version string
|
2013-04-23 10:34:26 +02:00 |
|
|
|
f788c31383
|
more detailed error message
|
2013-04-23 10:20:57 +02:00 |
|
|
|
42c512e1a0
|
update of colvars library to svn of 2013-04-17
|
2013-04-17 11:36:18 +02:00 |
|
|
|
354de185b1
|
update of colvars library to version 2013-01-30
|
2013-02-13 05:24:29 -05:00 |
|
|
|
4958bb300a
|
double inclusion protection bugfix
|
2013-01-28 05:46:05 -05:00 |
|
|
|
8e2290c770
|
update colvars module to version 2013-01-23
|
2013-01-23 06:16:25 -05:00 |
|
|
|
436f945723
|
Merge branch 'lammps-icms' into lammps-colvars
|
2013-01-18 07:54:45 -05:00 |
|
|
|
e1709a4489
|
Merge branch 'master' into lammps-icms
Resolved Conflicts:
src/USER-OMP/msm_omp.cpp
src/USER-OMP/msm_omp.h
src/USER-OMP/pair_born_coul_msm_omp.cpp
src/USER-OMP/pair_born_coul_msm_omp.h
src/USER-OMP/pair_buck_coul_msm_omp.cpp
src/USER-OMP/pair_buck_coul_msm_omp.h
src/USER-OMP/pair_coul_msm_omp.cpp
src/USER-OMP/pair_coul_msm_omp.h
src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp
src/USER-OMP/pair_lj_charmm_coul_msm_omp.h
src/USER-OMP/pair_lj_cut_coul_msm_omp.cpp
src/USER-OMP/pair_lj_cut_coul_msm_omp.h
|
2013-01-18 07:50:51 -05:00 |
|
|
|
f70511be87
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9276 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2013-01-17 15:50:53 +00:00 |
|
|
|
48fbb5605f
|
fix another merge bug
|
2013-01-16 07:49:36 -05:00 |
|
|
|
100cafe5ff
|
correct error from broken merge
|
2013-01-16 07:47:56 -05:00 |
|
|
|
b826d2958e
|
Merge branch 'lammps-icms' into lammps-colvars
|
2013-01-14 06:22:25 -05:00 |
|
|
|
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 |
|
|
|
c58b5f4d1b
|
import from colvars svn repo
|
2012-12-21 07:35:20 -05: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 |
|
