Merge remote-tracking branch 'upstream/lammps-icms' into improved_python_interface
Description
Description
Details
Details
- Committed
Richard Berger <richard.berger@temple.edu> May 31 2016, 21:39 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPSb68a2b91ab4b: Fix data type of stored value
rLAMMPSc6630c6f1b2f: Merge branch 'merge-pull-66' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| c6630c6f1b2f | Axel Kohlmeyer | Merge branch 'merge-pull-66' into lammps-icms | May 28 2016 | |||
| a02af68a22b4 | Axel Kohlmeyer | Merge branch 'merge-pull-65' into lammps-icms | May 28 2016 | |||
| fab73a9d520e | Axel Kohlmeyer | Merge branch 'morse-soft-cleanup' of https://github.com/Pakketeretet2/lammps… | May 28 2016 | |||
| 67c39b13c600 | Axel Kohlmeyer | Merge branch 'fix-manifold-cite' of https://github.com/Pakketeretet2/lammps… | May 28 2016 | |||
| c0d4385a6175 | Stefan Paquay | Resolved merge conflict with upstream. | May 28 2016 | |||
| ed8859aced87 | Stefan Paquay | Made example legal command. | May 28 2016 | |||
| 1cb1f88049e5 | Stefan Paquay | Made check for narg consistent with reduced number of args. | May 28 2016 | |||
| 7e6adb81c371 | Stefan Paquay | Updated doc/src/pair_morse.txt | May 28 2016 | |||
| 56e67fac70da | Stefan Paquay | Removed obsolete variable from pair_morse_soft. | May 28 2016 | |||
| bd81c9b9e8f4 | Stefan Paquay | Fixed/cleaned up pair morse/soft | May 28 2016 | |||
| fa9c3305a6d7 | Stefan Paquay | Fixed error in fix_nvt_manifold_rattle.cpp | May 28 2016 | |||
| 5d6cf32dfe32 | Axel Kohlmeyer | enable write_data support for umbrella improper style | May 28 2016 | |||
| 9b01e356add3 | Stefan Paquay | Updated citation for USER-MANIFOLD | May 27 2016 | |||
| 4e1e51a586c3 | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | May 27 2016 | |||
| 71c36003b934 | athomps | Added Axel's improvement | May 26 2016 | |||
| 8cedc0981394 | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | May 26 2016 | |||
| 4c5763fa8551 | Axel Kohlmeyer | enforce initialization of dynamic member variable and move check for dynamic… | May 26 2016 | |||
| edbb8bc31d8e | athomps | Fixed uninitialized variables | May 25 2016 | |||
| edb8cfcb6a85 | Axel Kohlmeyer | improve check for fix rigid in fix gcmc to flag incompatibility | May 25 2016 | |||
| eecee57de649 | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | May 25 2016 | |||
| e78d24a92f4e | Axel Kohlmeyer | compute voronoi/atom requires atom ids. use atom->map_tag_max instead of nall… | May 25 2016 | |||
| 48eefc71e922 | Axel Kohlmeyer | add missing semicolon to html encoded > and < | May 25 2016 | |||
| 1c19abfa3e6a | Axel Kohlmeyer | record the largest available tag for voronoi occupancy so that later added… | May 25 2016 | |||
| 20b0b4ec1893 | Axel Kohlmeyer | correct formatting of examples in voronoi/atom compute docs | May 25 2016 | |||
| d60fbe4c2280 | athomps | Blocked fix rigid | May 25 2016 | |||
| 97b8a30b72c8 | athomps | Blocked fix rigid | May 25 2016 | |||
| bbdd574e6db2 | athomps | Removed some memory leaks is SSA neighbor list | May 25 2016 | |||
| 01a17e803a6e | Axel Kohlmeyer | flag compute msd as incompatible with dynamic groups | May 24 2016 | |||
| b2ce582a4060 | Axel Kohlmeyer | make compute com and gyration compatible with dynamic groups | May 24 2016 | |||
| 3fe7cf47b662 | Axel Kohlmeyer | remove dead code | May 23 2016 |