Merge branch 'master' into USER-DPD_kokkos as of patch 31Mar17
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Apr 5 2017, 21:05 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS6ba59cb4583c: fix memory leak in fix_shardlow_kokkos
rLAMMPSae56b9ad8915: patch 31Mar17 for stable release - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| ae56b9ad8915 | Steve Plimpton | patch 31Mar17 for stable release | Mar 30 2017 | |||
| 4466d9fb4a47 | sjplimp/GitHub | Merge pull request #440 from ohenrich/user-cgdna | Mar 30 2017 | |||
| ac1aa9edea39 | Oliver Henrich | Updated README | Mar 29 2017 | |||
| c733204a700c | Oliver Henrich | Updated lammps.book and install script | Mar 29 2017 | |||
| 4b9d0a956632 | Steve Plimpton | sync with SVN | Mar 28 2017 | |||
| 0637f2387518 | Steve Plimpton | patch 28Mar17 | Mar 28 2017 | |||
| 9f6e126a2f2e | sjplimp/GitHub | Merge pull request #437 from ohenrich/user-cgdna | Mar 28 2017 | |||
| 645f56cf7021 | sjplimp/GitHub | Merge pull request #436 from Pakketeretet2/better_incorrect_input_handling_nh | Mar 28 2017 | |||
| 80e5111dcabc | sjplimp/GitHub | Merge pull request #434 from akohlmey/imgflags-in-library | Mar 28 2017 | |||
| 7e9f05b617ad | sjplimp/GitHub | Merge pull request #433 from akohlmey/fixes-for-stable | Mar 28 2017 | |||
| 1d8f0c762d2c | Axel Kohlmeyer | Merge branch 'master' into fixes-for-stable | Mar 28 2017 | |||
| ef6070cbdeb5 | Axel Kohlmeyer | remove executable permissions for potential files | Mar 28 2017 | |||
| 61f3ff1d2be2 | Steve Plimpton | Merge branch 'master' of github.com:lammps/lammps | Mar 28 2017 | |||
| 111d350a223f | Steve Plimpton | fix gcmc units change for chemical potential | Mar 28 2017 | |||
| 1dfd61f532a6 | sjplimp/GitHub | Merge pull request #432 from Pakketeretet2/user_manifold_fix | Mar 28 2017 | |||
| 5c1f5462e792 | Oliver Henrich | Removed contribution line from header files | Mar 28 2017 | |||
| 66a6375405b6 | Oliver Henrich | Resolved merge conflict | Mar 28 2017 | |||
| 604afebf6fef | Oliver Henrich | Update to oxDNA2 | Mar 28 2017 | |||
| 8afed61db1c8 | Oliver Henrich | Upgrade to oxDNA2 | Mar 28 2017 | |||
| ee55a981032f | Stefan Paquay | Changed the check on initial and final temperature to <= 0 for both. | Mar 28 2017 | |||
| f8da9a866a73 | Axel Kohlmeyer | synchronize dump custom/vtk documentation with that of dump custom | Mar 28 2017 | |||
| 28bdebd3c045 | Axel Kohlmeyer | avoid segfault when calling PPPM*::memory_usage() before grid communication is… | Mar 28 2017 | |||
| fc51c38abb2b | Axel Kohlmeyer | add some docs for the special treatment of image flags | Mar 28 2017 | |||
| 443ea13effa4 | Axel Kohlmeyer | add image flag packing/unpacking to library/python interface | Mar 28 2017 | |||
| 5feeb79c13f2 | Axel Kohlmeyer | one more line of dead code removed | Mar 27 2017 | |||
| a241b2d0f7c8 | Axel Kohlmeyer | fix problems with references | Mar 27 2017 | |||
| 61e7595a94bf | Axel Kohlmeyer | remove references to xmovie, streamline dump and viz descriptions | Mar 27 2017 | |||
| da9096750e55 | Axel Kohlmeyer | update .gitignore for newly added files | Mar 27 2017 | |||
| 87ea9ba66162 | Axel Kohlmeyer | bugfix for library interface | Mar 27 2017 | |||
| c041727e4fed | Axel Kohlmeyer | remove dead code and reduce trivial compiler warnings (clang++) | Mar 27 2017 | |||
| 3feffbe1de32 | Stefan Paquay | Removed diagnostics. | Mar 27 2017 | |||
| 04fd038d350b | Stefan Paquay | Fixed a bug with equal-style variables as manifold params. | Mar 27 2017 | |||
| 3dfe4505ddcb | Steve Plimpton | 24Mar17 patch sync with SVN | Mar 24 2017 | |||
| 394e9b42b06a | Steve Plimpton | new CHARMM pair styles with force swithing/shifting | Mar 24 2017 | |||
| e6fcaefe95d3 | sjplimp/GitHub | Merge pull request #431 from v0i0/fix-airebo-morse | Mar 24 2017 | |||
| f5a85d68add0 | sjplimp/GitHub | Merge pull request #429 from akohlmey/updates-for-stable | Mar 24 2017 | |||
| 277b93cb8956 | sjplimp/GitHub | Merge pull request #417 from tonnamb/add-pair-zhou | Mar 24 2017 | |||
| 8820315ff96a | Axel Kohlmeyer | Merge branch 'master' into updates-for-stable | Mar 23 2017 | |||
| 44841f689127 | Steve Plimpton | fix ave/chunk fixes, 2d disc option, fix_modify dynamic/dof | Mar 23 2017 | |||
| 2cdcd6d63045 | Axel Kohlmeyer | remove one more reference to xmovie | Mar 23 2017 | |||
| 47cade2bcff2 | Axel Kohlmeyer | re-arranged functions to make it easier to compare with non-threaded. port… | Mar 23 2017 | |||
| a72efbea3699 | Axel Kohlmeyer | whitespace cleanup | Mar 23 2017 | |||
| 5c9892c083dd | Axel Kohlmeyer | apply airebo/m bugfix also to USER-OMP version | Mar 23 2017 | |||
| 9ecc5c8cf7aa | Axel Kohlmeyer | Merge branch 'fix-airebo-morse' of https://github.com/v0i0/lammps into pull-431 | Mar 23 2017 | |||
| 47cebb0d2339 | Markus Hoehnerbach | And getting it right... | Mar 23 2017 | |||
| f127e428ccca | Markus Hoehnerbach | Fix airebo/morse | Mar 23 2017 | |||
| 568b67eee9cb | Axel Kohlmeyer | include citation for reference paper into pair style momb | Mar 23 2017 | |||
| 865b41e2014e | Axel Kohlmeyer | make pair style momb example follow LAMMPS conventions more closely | Mar 23 2017 | |||
| b88a7496808b | Axel Kohlmeyer | rename a couple more references to pair style zhou into momb | Mar 23 2017 | |||
| 02e65900e6ef | Tonnam Balankura | add example log file generated from 17Nov16 version of lammps, make minimize… | Mar 23 2017 |
