Merge branch 'integration' into new-master
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Sep 29 2016, 16:37 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS596b260f5d48: Merge pull request #45 from akohlmey/small-bugfixes
rLAMMPS78a22be93ffd: sync Make.py and fix addforce change with GHub - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 596b260f5d48 | sjplimp/GitHub | Merge pull request #45 from akohlmey/small-bugfixes | Sep 29 2016 | |||
| 446e7e736936 | Steve Plimpton | patch for allowing prd command to work with sorted atoms | Sep 29 2016 | |||
| 8c1d0031c999 | Axel Kohlmeyer | correct typo in Make.py | Sep 28 2016 | |||
| 829d11e88b9b | sjplimp/GitHub | Merge pull request #44 from rbberger/doc-fixes | Sep 27 2016 | |||
| 1adf3858a9bf | Axel Kohlmeyer | correct bug and synchronize fix addforce respa level init with other fixes | Sep 27 2016 | |||
| 96f31d6dade5 | sjplimp/GitHub | Merge pull request #43 from akohlmey/doc-fixes | Sep 27 2016 | |||
| 35705217f4bb | Steve Plimpton | enable multi-processor NEB replicas | Sep 27 2016 | |||
| 9a2f7386731e | Steve Plimpton | sync with SVN | Sep 27 2016 | |||
| f9c204972474 | Axel Kohlmeyer | need to ignore new fix cmap sources | Sep 27 2016 | |||
| e1c6b6b7d153 | Axel Kohlmeyer | correctly handle exceptions raised from subprocess module | Sep 27 2016 | |||
| a3a3af691c07 | Steve Plimpton | Merge branch 'balance' into integration | Sep 27 2016 | |||
| f9677e6d7b71 | Steve Plimpton | released version of weighted balancing | Sep 27 2016 | |||
| a3277117e250 | Richard Berger | Add filter which merges preformatted sections | Sep 27 2016 | |||
| 67d4c07689a3 | Richard Berger | Do not escape underscore inside preformat blocks | Sep 27 2016 | |||
| 877a5049332e | Richard Berger | Fix typo in Section_howto.txt | Sep 27 2016 | |||
| 8a951f9d7983 | Axel Kohlmeyer | fix typo | Sep 27 2016 | |||
| 69a8842ecb81 | Axel Kohlmeyer | update load balance weights documentation for fix balance and balance | Sep 27 2016 | |||
| 2af5c75f4269 | Axel Kohlmeyer | correct issue from merge | Sep 27 2016 | |||
| 158599fca211 | Axel Kohlmeyer | Merge branch 'balance2' into weighted-balancing | Sep 27 2016 | |||
| 7732548b3c0f | Axel Kohlmeyer | correct issues related to the addition of fix cmap | Sep 27 2016 | |||
| 2c5f6e1a993b | Axel Kohlmeyer | fix a broken link that slipped through the cracks in the previous cleanup | Sep 27 2016 | |||
| d0aa13b5431c | Richard Berger | Fix broken link in Section_packages.txt | Sep 26 2016 | |||
| c31b026797cf | Axel Kohlmeyer | Merge branch 'integration' into weighted-balancing | Sep 26 2016 | |||
| 47b52ed2ddf4 | Axel Kohlmeyer | Merge branch 'integration' into balance2 | Sep 26 2016 | |||
| c87f9aeb9f4e | Richard Berger | Merge remote-tracking branch 'akohlmey/integration' into ipython-update-and… | Sep 26 2016 | |||
| b97b9dd66188 | Steve Plimpton | new fix cmap command | Sep 26 2016 | |||
| 86d17a578411 | sjplimp/GitHub | Merge pull request #42 from akohlmey/redo-fix-ti-spring-fixes | Sep 23 2016 | |||
| c00cd6192d9c | sjplimp/GitHub | Merge pull request #41 from akohlmey/doc-fixes | Sep 23 2016 | |||
| fc031c34bddd | sjplimp/GitHub | Merge pull request #40 from akohlmey/eam-fixes-for-scale | Sep 23 2016 | |||
| d730cda2480f | sjplimp/GitHub | Merge pull request #37 from rbberger/library_interface_abort | Sep 23 2016 | |||
| 6f4b7268ded6 | Steve Plimpton | sync with SVN | Sep 23 2016 | |||
| 08f0bf90253e | Steve Plimpton | new verion of balance weighting | Sep 23 2016 | |||
| 3d5f5bf40e58 | Axel Kohlmeyer | a few more consolidations of link anchors | Sep 23 2016 | |||
| 065d35eefa45 | Axel Kohlmeyer | update kokkos compilation instructions to use provided preset makefiles | Sep 23 2016 | |||
| 378524903330 | Axel Kohlmeyer | use "make mpi" instead of "make g++" in examples | Sep 23 2016 | |||
| e18941e865b8 | Axel Kohlmeyer | delete bogus line (how did this get into the docs?) | Sep 23 2016 | |||
| c6cebe66c75d | Axel Kohlmeyer | making more links and anchors consistent and correct errors | Sep 23 2016 | |||
| 08d9792ec854 | Axel Kohlmeyer | add an additional explanation to compute XXX/tally docs and fix a typo | Sep 23 2016 | |||
| c10aa55fc15d | Axel Kohlmeyer | Merge branch 'integration' into doc-fixes | Sep 22 2016 | |||
| 2bf6688388f9 | Axel Kohlmeyer | fix bug in fix_modify respa reported by steven early strong on lammps-users | Sep 22 2016 | |||
| b3217218d67b | Steve Plimpton | doc page sync with SVN | Sep 22 2016 | |||
| d3406df6a0ca | Richard Berger | Updated instructions in IPython notebooks | Sep 21 2016 | |||
| a4c8c9b1f973 | Richard Berger | Strip IPython notebooks of output | Sep 21 2016 | |||
| f1183cb97c19 | Richard Berger | Remove old copies of IPython notebooks | Sep 21 2016 | |||
| 68d6f105d018 | Axel Kohlmeyer | need to add removed fix ti/rs to purge list | Sep 21 2016 | |||
| b27179bbef55 | Axel Kohlmeyer | restore bugfixes and updates that were lost. flag time dependet. correct use of… | Sep 21 2016 | |||
| 90ff54c44fa3 | Richard Berger | Ensure all library functions capture exceptions | Sep 21 2016 | |||
| 2943dd5c12d6 | Axel Kohlmeyer | correct another broken link in fix ti/spring | Sep 21 2016 | |||
| 33d9a55d358f | Axel Kohlmeyer | remove references to docs for fix ti/rs | Sep 21 2016 | |||
| 5345efb5b87f | Axel Kohlmeyer | correct broken link in updated fix ti/spring docs | Sep 21 2016 |