Merge branch 'integration' into weighted-balancing
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Sep 14 2016, 20:04 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS717e719b8300: HTML update
rLAMMPS0f7873c0b8d2: Merge branch 'integration' into weighted-balancing - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 717e719b8300 | Steve Plimpton | HTML update | Sep 14 2016 | |||
| 10b4411d5b8f | Steve Plimpton | Merge branch 'integration' of github.com:akohlmey/lammps into integration | Sep 14 2016 | |||
| c744b23c4c04 | Steve Plimpton | doc updates | Sep 14 2016 | |||
| a69e059be324 | sjplimp/GitHub | Merge pull request #27 from akohlmey/small-bugfixes | Sep 14 2016 | |||
| dbc548dd8810 | sjplimp/GitHub | Merge pull request #26 from rbberger/is_available_feature | Sep 14 2016 | |||
| 25e518a4f40b | Steve Plimpton | added options to compute bond/local | Sep 14 2016 | |||
| fe2fca4e9b3b | Steve Plimpton | clean-up of example files | Sep 13 2016 | |||
| ed52f9ea5e39 | Steve Plimpton | pair vashishta/table | Sep 13 2016 | |||
| 944289b018a7 | Steve Plimpton | final version of pair vashishta/table | Sep 13 2016 | |||
| 80c5b01bfcd6 | Axel Kohlmeyer | flag 'allocated' must be initialized in constructor | Sep 13 2016 | |||
| 51e4a568c9b1 | Axel Kohlmeyer | Merge branch 'small-bugfixes' of github.com:akohlmey/lammps into small-bugfixes | Sep 13 2016 | |||
| a8081d450728 | Steve Plimpton | fix qeq Kokkos bug fix by Stan | Sep 13 2016 | |||
| 14bed44743d6 | Axel Kohlmeyer | ignore Makefile.lammps in lib tree | Sep 13 2016 | |||
| 18cacb8e1dab | Axel Kohlmeyer | ignore *.mod generated by fortran compilers | Sep 13 2016 | |||
| e53862ca4a23 | Axel Kohlmeyer | update html file updated boundary.txt file | Sep 11 2016 | |||
| a64eb330e3a2 | Axel Kohlmeyer | document how using shrink-wrap boundaries can cause lost atoms in parallel | Sep 11 2016 | |||
| d70e051ecd7f | Axel Kohlmeyer | update docs for lj/sf/dipole/sf | Sep 9 2016 | |||
| 37833b537b9b | Axel Kohlmeyer | restore c++ marker in header comment | Sep 9 2016 | |||
| 5fcbfa824820 | Axel Kohlmeyer | simplify phonon code some more | Sep 9 2016 | |||
| c437195928a0 | Axel Kohlmeyer | simplify code | Sep 9 2016 | |||
| 8b1ef1c686cb | Axel Kohlmeyer | import updated pair lj/sf/dipole/sf files from sam genheden | Sep 9 2016 | |||
| c3e8cb2f30c5 | Axel Kohlmeyer | fix typo in comments | Sep 9 2016 | |||
| 365707704cf8 | Axel Kohlmeyer | update error message to be consistent with other styles | Sep 9 2016 | |||
| 16323ba391ea | Axel Kohlmeyer | require an atom map for compute voronoi/atom occupation | Sep 9 2016 | |||
| e27869daf684 | Richard Berger | Add updated HTML documentation about new is_available feature category | Sep 9 2016 | |||
| dc0c0ab214d3 | Richard Berger | Add documentation about new is_available feature category | Sep 9 2016 | |||
| 4b22443b25d2 | Richard Berger | Add feature category to is_available function | Sep 9 2016 | |||
| 956af8cebb2c | Axel Kohlmeyer | update html file | Sep 8 2016 | |||
| 5c927ca8398e | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-rw/integration' into vashishta-tabulation | Sep 8 2016 | |||
| 4bb42be3cc09 | Axel Kohlmeyer | implement vashishta/table/omp in USER-OMP | Sep 8 2016 | |||
| 7de51430504e | Axel Kohlmeyer | update vashishta pair style example | Sep 8 2016 | |||
| 71eed1d612ab | Axel Kohlmeyer | update documentation for vashishta pair style | Sep 8 2016 | |||
| dd34feb2bdc6 | Steve Plimpton | Merge branch 'small' into integration | Sep 8 2016 | |||
| 2524c5b52654 | Steve Plimpton | Merge branch 'small-bugfixes' of https://github.com/akohlmey/lammps into small | Sep 8 2016 | |||
| fe581e8ced13 | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-rw/integration' into vashishta-tabulation | Sep 8 2016 | |||
| b866e0663b9f | sjplimp/GitHub | Merge pull request #24 from rbberger/info_command_styles | Sep 8 2016 | |||
| 5d0da95a0b6d | sjplimp/GitHub | Merge pull request #23 from akohlmey/doc-corrections-and-updates | Sep 8 2016 | |||
| 07e55ef61e7d | sjplimp/GitHub | Merge pull request #22 from akohlmey/colvars-update | Sep 8 2016 | |||
| 236ebf7fabbb | Steve Plimpton | Kokkos lib update | Sep 8 2016 | |||
| a6df1e53b43f | Axel Kohlmeyer | ignore all variants of the vashishta pair styles in src/ | Sep 8 2016 | |||
| 9b2d5ff3e72d | Axel Kohlmeyer | remove executable permissions on non-executables and non-scripts | Sep 8 2016 | |||
| c33e1049d8dd | Axel Kohlmeyer | delete duplicate fclose() in fix ttm/mod constructor | Sep 8 2016 | |||
| 1f901c9b2daa | Richard Berger | Update generated HTML docs of info command | Sep 8 2016 | |||
| 79b8f6320d62 | Richard Berger | Update docs of info command | Sep 8 2016 | |||
| 2dcfb51d1807 | Richard Berger | Change info command styles syntax | Sep 8 2016 | |||
| ba2b523bf4b7 | Richard Berger | Use factory for region style creation | Sep 8 2016 | |||
| fd2b88642278 | Richard Berger | Use factory for dump style creation | Sep 8 2016 | |||
| 9952d8a210fc | Richard Berger | Use factory for minimize style creation | Sep 8 2016 | |||
| 85c132943ed5 | Richard Berger | Use factory for integrate style creation | Sep 8 2016 | |||
| 55260ad53e5b | Richard Berger | Add missing delete in destructor | Sep 8 2016 |