Merge branch 'integration' into weighted-balancing
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Sep 1 2016, 14:26 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPSfb2c18ee8872: Merge pull request #17 from akohlmey/small-doc-fixes
rLAMMPSeac721772089: Merge remote-tracking branch 'lammps-rw/integration' into weighted-balancing - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
fb2c18ee8872 | sjplimp/GitHub | Merge pull request #17 from akohlmey/small-doc-fixes | Sep 1 2016 | |||
b5c758f22c60 | Steve Plimpton | Merge branch 'goo' into integration | Sep 1 2016 | |||
de0036fafd07 | Steve Plimpton | removing searchindex.js | Sep 1 2016 | |||
c3c9788dc72c | Axel Kohlmeyer | include autogenerated html code | Sep 1 2016 | |||
2abd5ad28ae2 | Axel Kohlmeyer | Merge branch 'integration' into small-doc-fixes | Sep 1 2016 | |||
1c3302d1db6e | sjplimp/GitHub | Merge pull request #15 from rbberger/pylammps-improvements | Sep 1 2016 | |||
24409b61782b | Steve Plimpton | Merge branch 'error' into integration | Sep 1 2016 | |||
de21cb2cd596 | Steve Plimpton | small changes to doc page | Sep 1 2016 | |||
639ab0fd3e37 | Steve Plimpton | Merge branch 'core/cpp_exceptions' of https://github.com/rbberger/lammps into… | Sep 1 2016 | |||
6c65af710c01 | Steve Plimpton | bad file? | Sep 1 2016 | |||
29e480ad666c | Axel Kohlmeyer | corrections for various compute something/chunk examples | Aug 31 2016 | |||
7c01ef57eeb0 | Steve Plimpton | sync with SVN | Aug 31 2016 | |||
0316bb579be8 | sjplimp/GitHub | Merge pull request #3 from akohlmey/fix-flow-gauss | Aug 31 2016 | |||
f89448d73c91 | sjplimp/GitHub | Merge pull request #6 from akohlmey/manifold-doc-update | Aug 31 2016 | |||
1986eda4d5f1 | Richard Berger | Remove no longer needed generated files in doc | Aug 31 2016 | |||
e71fafdd256c | Richard Berger | Use Google Custom Search API for searching in docs | Aug 31 2016 | |||
6cbdad7a97a7 | Richard Berger | Add utility function to IPyLammps for embedding videos | Aug 30 2016 | |||
a08cf7a4b6a0 | Richard Berger | Add verbose option in PyLammps methods | Aug 30 2016 | |||
691de01b3383 | Richard Berger | Allow setting the position of atoms | Aug 30 2016 | |||
33a87a470a2b | Richard Berger | Return 2D vectors in 2D cases | Aug 30 2016 | |||
59dc83eadbde | Richard Berger | Fix resource leak | Aug 30 2016 | |||
4e03df2d197b | Axel Kohlmeyer | Merge branch 'integration' into fix-flow-gauss | Aug 28 2016 | |||
e1045851c035 | Axel Kohlmeyer | incorporate bugfix and cleanup from lammps-icms and upstream | Aug 28 2016 | |||
f5a50c3cd1c8 | Richard Berger | Added documentation about -DLAMMPS_EXCEPTIONS flag | Aug 28 2016 | |||
bb721db8de40 | Axel Kohlmeyer | Merge branch 'integration' into fix-flow-gauss | Aug 28 2016 | |||
1c13b30a7039 | Axel Kohlmeyer | small cleanup and generalization of fix flow/gauss | Aug 27 2016 | |||
b8e7f5301702 | Stefan Paquay/Axel Kohlmeyer | Small update for USER-MANIFOLD docs. | Aug 25 2016 | |||
e5c37bc7cb8e | Richard Berger | Implemented optional C++ exceptions in Error class | Aug 24 2016 | |||
1ab3891caf0e | Axel Kohlmeyer | Merge branch 'merge-pull-153' into lammps-icms | Aug 23 2016 |