Merge branch 'master' into add-user-reaxc-omp
This updates the code base with several required updates from master
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> May 31 2017, 18:53 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPSd2b65590392e: Fixing issue in fix_qeq_reax
rLAMMPS286d4f2743f8: Merge pull request #506 from lammps/snap - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 286d4f2743f8 | sjplimp/GitHub | Merge pull request #506 from lammps/snap | May 30 2017 | |||
| 952b18fc0284 | sjplimp/GitHub | Merge pull request #494 from rbberger/small_updates | May 30 2017 | |||
| 816fa934292c | sjplimp/GitHub | Merge pull request #499 from akohlmey/add-fix-compute-style-bugfix | May 30 2017 | |||
| f4f975edd608 | sjplimp/GitHub | Merge pull request #495 from akohlmey/doc-fixes | May 30 2017 | |||
| cff4e4a83744 | sjplimp/GitHub | Merge pull request #468 from andeplane/gcmc_fix_nlocal | May 30 2017 | |||
| 32db4660bd37 | sjplimp/GitHub | Merge pull request #460 from andeplane/gcmc_fix | May 30 2017 | |||
| 22fdb1fc1407 | Steve Plimpton | SNAP changes by Aidan | May 30 2017 | |||
| 412cb8f089bb | Axel Kohlmeyer | avoid hang in fix reax/c/species when multiple atoms have the exact same x… | May 30 2017 | |||
| 092806ad4fe1 | Axel Kohlmeyer | no need for special whitespace handling in library interface | May 30 2017 | |||
| 4ae314731d99 | Axel Kohlmeyer | must not use strtok() in library function as it is not re-entrant and may be… | May 30 2017 | |||
| 4b8d2e829c24 | Axel Kohlmeyer | triclinic member variable is referenced in destructor and thus must be… | May 30 2017 | |||
| d93938f7e17f | Axel Kohlmeyer | displace_atom rotate needs to operate on unwrapped coordinates with image flags… | May 29 2017 | |||
| c0339120d2a5 | Axel Kohlmeyer | add missing neighbor list class definitions to USER-OMP | May 27 2017 | |||
| 5a23d2d1da75 | Axel Kohlmeyer | fix bug in computing mixed EAM potentials introduced by TI modifications | May 27 2017 | |||
| de446ace2fec | Axel Kohlmeyer | Merge branch 'user-manifold-doc-fix' of https://github.com/Pakketeretet2/lammps… | May 27 2017 | |||
| 2055110e05d0 | Stefan Paquay | Fixed typo in dox. | May 26 2017 | |||
| 5b1e582f0377 | Axel Kohlmeyer | prevent segfault when defining pair_style comb3 without arguments | May 26 2017 | |||
| 53e7fee5b778 | Axel Kohlmeyer | Merge branch 'doc-fixes' of github.com:akohlmey/lammps into doc-fixes | May 25 2017 | |||
| 5291f2ed6e8d | Axel Kohlmeyer | fix bug in fix shear/history reported by kevin hanley. see #500 | May 25 2017 | |||
| 99a68e487f07 | Axel Kohlmeyer | fix suffix style handling bug for adding fixes and computes | May 25 2017 | |||
| 88d4150d2bf8 | Axel Kohlmeyer | remove trailing whitespace | May 24 2017 | |||
| ead05f81c09c | Axel Kohlmeyer | Merge branch 'pair_morse_soft-doc-fix' of https://github. | May 24 2017 | |||
| 4f9e7cbd161f | Stefan Paquay | Cleaned up docs for pair_mores, a missing :pre ruined formatting. | May 24 2017 | |||
| bdfb7c69ea3f | Richard Berger | Remove unused code detected by coverity CID 177700 | May 22 2017 | |||
| 084626e60b43 | Richard Berger | Fixes coverity issue CID 179426 | May 22 2017 | |||
| a7d790a82778 | Richard Berger | Fixes coverity issue CID 179439 | May 22 2017 | |||
| 8a630ff4ec8a | Richard Berger | Fixes coverity issue CID 179440 | May 22 2017 | |||
| 617ca4e0c89b | Richard Berger | Fixes coverity issue CID 179436 | May 22 2017 | |||
| 06a4f47a4c37 | Richard Berger | Merge remote-tracking branch 'upstream/master' into small_updates | May 22 2017 | |||
| 4780d72809c0 | Axel Kohlmeyer | use '&&' and '||' instead of 'and' and 'or' operators for consistency | May 22 2017 | |||
| 97d3c843c44a | Axel Kohlmeyer | small documentation fixes to fix typos and formatting issues | May 21 2017 | |||
| 9593e05c9ec5 | Richard Berger | Force PDF documentation build to fail on first error | May 19 2017 | |||
| 914848433a9e | Anders Hafreager | Using correct value for atom->nlocal | May 1 2017 | |||
| 67fced37c826 | Anders Hafreager | Setting molecule COM to 0 after moving atoms | Apr 26 2017 |