Merge branch 'integration' into weighted-balancing
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Sep 26 2016, 21:20 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPSb97b9dd66188: new fix cmap command
rLAMMPS40b68820d968: update html docs to be used with latest version of converter tools - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 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 | |||
| 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 | |||
| 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 | |||
| 9bedb8a1c9cf | Axel Kohlmeyer | ignore generated files in html folder | Sep 21 2016 | |||
| 0d7e4f1e8827 | Axel Kohlmeyer | update docs for pair style gauss/cut to document optional per pair cutoff | Sep 21 2016 | |||
| 9ef748bbaaa9 | Steve Plimpton | remvoing doc/html | Sep 21 2016 | |||
| 259177630a79 | Axel Kohlmeyer | whitespace cleanup | Sep 20 2016 | |||
| 10034ce336d0 | Axel Kohlmeyer | port support for scale[] factor with fix adapt to OPT and USER-OMP | Sep 20 2016 | |||
| 281ace327fb1 | Axel Kohlmeyer | we should scale energies as well as forces | Sep 20 2016 | |||
| c6ee5065ed20 | Axel Kohlmeyer | allow to override PairEAM::extract() | Sep 20 2016 | |||
| 04eadb634194 | Richard Berger | Merge remote-tracking branch 'akohlmey/integration' into library_interface_abort | Sep 20 2016 | |||
| f4263e3849ec | Richard Berger | Simplify MPI abort code path, make C++ exceptions optional | Sep 20 2016 | |||
| b4e28767760e | Richard Berger | Fix typo | Sep 20 2016 | |||
| 3a73a1476e2b | Axel Kohlmeyer | disable use of fix adapt with EAM for GPU+KOKKOS and CDEAM | Sep 20 2016 | |||
| 5c37fccf49c2 | Steve Plimpton | fix ti/spring for eam/allow and eam/fs | Sep 20 2016 | |||
| b9b044e180df | Steve Plimpton | new fix ti/spring command, remove fix ti/rs | Sep 20 2016 | |||
| 7dc8746f9ec2 | sjplimp/GitHub | Merge pull request #39 from akohlmey/small-bugfixes | Sep 20 2016 | |||
| 5d89493a1012 | sjplimp/GitHub | Merge pull request #38 from akohlmey/consolidate-pycache | Sep 20 2016 | |||
| 7bb880f0a843 | Axel Kohlmeyer | remove debug code | Sep 20 2016 | |||
| 849ff25d9206 | Axel Kohlmeyer | demote OMP_NUM_THREAD "warning" to "message" in the hope to be less confusing… | Sep 20 2016 | |||
| faa0b401aa91 | Axel Kohlmeyer | fix argument indexing bug in fix ave/atom | Sep 20 2016 | |||
| aa9fe38c5c97 | Axel Kohlmeyer | consolidate ignoring python bytecompiled cache files | Sep 17 2016 | |||
| 719d7c65b6a0 | Richard Berger | Make exceptions control flow and functions optional | Sep 17 2016 | |||
| 8db7ef436481 | Richard Berger | Merge remote-tracking branch 'akohlmey/integration' into library_interface_abort | Sep 17 2016 | |||
| d17421eb7c2e | sjplimp/GitHub | Merge pull request #36 from akohlmey/small_bugfixes_and_cleanups | Sep 16 2016 | |||
| 60dfdbc06302 | sjplimp/GitHub | Merge pull request #35 from akohlmey/lj_sf_dipole_sf_correction | Sep 16 2016 | |||
| e4bd63759b96 | sjplimp/GitHub | Merge pull request #34 from rbberger/make_py_fixes | Sep 16 2016 | |||
| ca558f6712fe | sjplimp/GitHub | Merge pull request #33 from rbberger/pylammps_additions | Sep 16 2016 | |||
| abf05eed6171 | Steve Plimpton | comm tiled bug fix | Sep 16 2016 | |||
| 72ce8ff89f56 | sjplimp/GitHub | Merge pull request #31 from akohlmey/doc-cleanups-and-updates | Sep 16 2016 | |||
| 76d876f86165 | Richard Berger | Allow detection of MPI_Abort condition in library call | Sep 16 2016 | |||
| 9637a5b5306f | Axel Kohlmeyer | colvars bugfix. updates colvars library to version 2016-09-14 | Sep 16 2016 |