lammps/srclammm-master
lammps/src
lammm-master
History Graph
History Graph
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
084454855537 | Axel Kohlmeyer | resolve one more merge conflict | Dec 9 2011 | |||
2b97a34844b2 | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Dec 9 2011 | |||
cb224643d789 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7328 f3b2605a-c512-4ea7… | Dec 9 2011 | |||
0c982d0f4a09 | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Dec 9 2011 | |||
5fa4f2eb2651 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7325 f3b2605a-c512-4ea7… | Dec 9 2011 | |||
62b27e591539 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7324 f3b2605a-c512-4ea7… | Dec 9 2011 | |||
650607a38bc0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7323 f3b2605a-c512-4ea7… | Dec 9 2011 | |||
91388f635f9a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7319 f3b2605a-c512-4ea7… | Dec 9 2011 | |||
501eb48d5b90 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7318 f3b2605a-c512-4ea7… | Dec 9 2011 | |||
96e9210c160f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7316 f3b2605a-c512-4ea7… | Dec 8 2011 | |||
e1f70c3a98c0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7314 f3b2605a-c512-4ea7… | Dec 8 2011 | |||
e08627bdc8f1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7312 f3b2605a-c512-4ea7… | Dec 8 2011 | |||
b1334c1314be | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7311 f3b2605a-c512-4ea7… | Dec 8 2011 | |||
16a2afc64205 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7310 f3b2605a-c512-4ea7… | Dec 8 2011 | |||
4639a1af5790 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7305 f3b2605a-c512-4ea7… | Dec 8 2011 | |||
9224da83abce | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7303 f3b2605a-c512-4ea7… | Dec 8 2011 | |||
6e49ba9d3b62 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7298 f3b2605a-c512-4ea7… | Dec 6 2011 | |||
8b1ab26c0be8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7297 f3b2605a-c512-4ea7… | Dec 6 2011 | |||
7595f64f0577 | Axel Kohlmeyer | cosmetic changes | Dec 3 2011 | |||
5d0e05d0b0a2 | Axel Kohlmeyer | Merge branch 'openmp-master' of github.com:akohlmey/lammps-omp into openmp… | Dec 3 2011 | |||
ca4f23380212 | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Dec 3 2011 | |||
66a6c37c996c | Axel Kohlmeyer | fix bug in memory clearing | Dec 3 2011 | |||
eaf9944f4b02 | Axel Kohlmeyer | update to dec 4 patch ahead of git update. | Dec 3 2011 | |||
d4a1d2a6a1b6 | Axel Kohlmeyer | Merge branch 'openmp-master' of github.com:akohlmey/lammps-omp into openmp… | Dec 2 2011 | |||
d8449c71012e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7296 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
2732520eaba9 | Axel Kohlmeyer | try to make neigh*_omp.* code part of USER-OMP | Dec 2 2011 | |||
666e5f981568 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7294 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
ab6e3568083a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7290 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
eca63a1b690a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7289 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
a362ece3e7e1 | Axel Kohlmeyer | fix timer->init() bug | Dec 2 2011 | |||
9d162cd555bd | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Dec 2 2011 | |||
6bfa87dcb5c5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7287 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
10fe5508e2d2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7286 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
111f044b8584 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7285 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
2e2d4c0b8147 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7282 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
4fe24446dec6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7279 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
1783b93a0882 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7278 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
37d7386667bc | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7277 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
24a85166bf11 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7276 f3b2605a-c512-4ea7… | Dec 2 2011 | |||
0ce291599e37 | Axel Kohlmeyer | bugfix for bug reported by karl hammond | Dec 2 2011 | |||
5a968ac62e01 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7272 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
a6d0ca14cf51 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7270 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
4643566b2519 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7267 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
8c372f6c410d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7266 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
57a20c2706ce | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7265 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
389584998643 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7264 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
b3cd459ea9fb | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7263 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
21e591dba113 | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Dec 1 2011 | |||
ba728e5e07e1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7262 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
d96b0ab866ae | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7255 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
0dacc993ae27 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7254 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
e2d5ab683f49 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7253 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
badb8c439d8d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7252 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
b7f57f079dfd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7251 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
263875b6fd01 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7249 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
f823c6e4fc2d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7247 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
68ddd409e158 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7245 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
21c24459c92c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7244 f3b2605a-c512-4ea7… | Dec 1 2011 | |||
31cdb2937798 | Axel Kohlmeyer | add missing line | Nov 30 2011 | |||
04a52667efad | Axel Kohlmeyer | port implicit package omp to clear command. | Nov 30 2011 | |||
f397ec383298 | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Nov 30 2011 | |||
61622c72b37b | Axel Kohlmeyer | move lj/sdk potentials into USER-CG-CMM package | Nov 30 2011 | |||
84bc16311e07 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7241 f3b2605a-c512-4ea7… | Nov 28 2011 | |||
afb76218387c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7238 f3b2605a-c512-4ea7… | Nov 28 2011 | |||
c032f772ac67 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7236 f3b2605a-c512-4ea7… | Nov 28 2011 | |||
f358b95cdf92 | Axel Kohlmeyer | Merge branch 'openmp-master' of github.com:akohlmey/lammps-omp into openmp… | Nov 20 2011 | |||
0d5f2283b1c8 | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Nov 17 2011 | |||
8fb28ae020ea | athomps | Modified error messages | Nov 16 2011 | |||
a925d868fa91 | Axel Kohlmeyer | Merge branch 'openmp-master' of github.com:akohlmey/lammps-omp into openmp… | Nov 15 2011 | |||
ccd5c7b9a1c4 | Axel Kohlmeyer | revert to using preprocessor macros for MIN/MAX, since the templated inline… | Nov 14 2011 | |||
ad5e85a4bf32 | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Nov 14 2011 | |||
b20b4a356cdc | Axel Kohlmeyer | add test prohibiting use of USER-OMP styles with r-RESPA | Nov 12 2011 | |||
b0445c93b111 | Axel Kohlmeyer | prep for threaded fixes that may need to reduce forces | Nov 12 2011 | |||
0dd5d15abab3 | Axel Kohlmeyer | fix bug causing memory corruption with compute_rho1d_thr() | Nov 12 2011 | |||
69b7787ff259 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7228 f3b2605a-c512-4ea7… | Nov 11 2011 | |||
0723de1e2f42 | Axel Kohlmeyer | Merge branch 'openmp-master' of github.com:akohlmey/lammps-omp into openmp… | Nov 10 2011 | |||
756940313d81 | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Nov 10 2011 | |||
682d51a6d9e5 | Axel Kohlmeyer | remove traces of GPU+thread support from GPU package | Nov 10 2011 | |||
189e650c6702 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7226 f3b2605a-c512-4ea7… | Nov 9 2011 | |||
0be567a00a70 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7225 f3b2605a-c512-4ea7… | Nov 9 2011 | |||
9e9e85d103d3 | Axel Kohlmeyer | remove redundant bugfix | Nov 9 2011 | |||
0745f717d8db | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Nov 9 2011 | |||
45040c4fdd0a | Axel Kohlmeyer | add threaded versions of coul/diel and gauss/cut | Nov 9 2011 | |||
fa66e183e360 | Axel Kohlmeyer | bugfixes | Nov 9 2011 | |||
feca20292aee | Axel Kohlmeyer | make the processor grid info less confusing | Nov 9 2011 | |||
dc263fb4d988 | Axel Kohlmeyer | add gauss/cut and coul/diel for arben's implicit solvent | Nov 9 2011 | |||
f9807b3ebf0c | Axel Kohlmeyer | use single precision FFT-2 for now | Nov 9 2011 | |||
63dd17808d24 | Axel Kohlmeyer | remove threaded gpu style and update install script for cg/cmm lj/sdk rename | Nov 9 2011 | |||
07e32b3836c9 | Axel Kohlmeyer | add backward compatibility with cg/cmm style | Nov 9 2011 | |||
45f492e42b15 | Axel Kohlmeyer | fix bug that killed coulomb contributions | Nov 9 2011 | |||
fae31df039dc | Axel Kohlmeyer | fix typo | Nov 9 2011 | |||
1963ce87832a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7223 f3b2605a-c512-4ea7… | Nov 8 2011 | |||
181c77d346ac | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7222 f3b2605a-c512-4ea7… | Nov 8 2011 | |||
0ce50309a42b | Axel Kohlmeyer | more files to ignore | Nov 8 2011 | |||
fb788f6a05f9 | Axel Kohlmeyer | convert lj/sdk GPU styles to use the new CPU version | Nov 8 2011 | |||
ef385531fefa | Axel Kohlmeyer | fix bug with coefficient parsing for sdk angles | Nov 8 2011 | |||
3fb3dfa5478d | Axel Kohlmeyer | rename cg/cmm styles to the new lj/sdk names | Nov 8 2011 | |||
023128d64ac7 | Axel Kohlmeyer | more files to ignore | Nov 8 2011 | |||
45479a785a15 | Axel Kohlmeyer | complete implementation of angle/sdk and add multi-threaded version | Nov 8 2011 | |||
1c5de20564d6 | Axel Kohlmeyer | Merge branch 'libgpu-update' into openmp-step10 | Nov 8 2011 |
c4science · Help