Merge branch 'master' of https://github.com/lammps/lammps into USER-DPD_kokkos
Description
Description
Details
Details
- Committed
Stan Moore <stamoor@sandia.gov> Mar 7 2017, 19:47 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS5b3101cb346f: Merge pull request #16 from ibaned/cuda-runtime
rLAMMPS79b005dc3d5f: patch 7Mar17 - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
79b005dc3d5f | Steve Plimpton | patch 7Mar17 | Mar 7 2017 | |||
a2fa6ef4524c | sjplimp/GitHub | Merge pull request #393 from akohlmey/small-bugfixes | Mar 7 2017 | |||
920641bbffbc | sjplimp/GitHub | Merge pull request #399 from rbberger/docs_spelling_fixes | Mar 7 2017 | |||
c2aabdec229c | sjplimp/GitHub | Merge pull request #398 from stanmoore1/kokkos_changes | Mar 7 2017 | |||
e4aa735a6809 | sjplimp/GitHub | Merge pull request #395 from timattox/USER-DPD_bugfix | Mar 7 2017 | |||
4af6557568e7 | sjplimp/GitHub | Merge pull request #394 from jaapkroe/kolmogorov-crespi | Mar 7 2017 | |||
0798885bdb2a | sjplimp/GitHub | Merge pull request #389 from akohlmey/update-agni-potential | Mar 7 2017 | |||
020e75e7efff | sjplimp/GitHub | Merge pull request #386 from akohlmey/doc-consistentcy | Mar 7 2017 | |||
d6866f1cfdd7 | sjplimp/GitHub | Merge pull request #376 from v0i0/airebo-bondorderLJ-fixes | Mar 7 2017 | |||
efaa4c67109f | Steve Plimpton | new neigh_modify exclude option, other SNAP changes | Mar 7 2017 | |||
08baaa9d8ede | Richard Berger | Fix more typos in tools | Mar 7 2017 | |||
359af419a7ab | Richard Berger | Fix typo in python README | Mar 7 2017 | |||
21be86c42393 | Richard Berger | Fix typos in txt2html | Mar 7 2017 | |||
d6800405a518 | Richard Berger | Fix more typos in examples | Mar 7 2017 | |||
3a054d1a82b2 | Richard Berger | Fix more typos in src files | Mar 7 2017 | |||
007f3c66a033 | Richard Berger | Third batch of spelling fixes in manual | Mar 7 2017 | |||
32708860a9fa | Richard Berger | Add remaining false positives | Mar 7 2017 | |||
fc9eebb9367c | Richard Berger | Added spellcheck utility to documentation build | Mar 6 2017 | |||
dd76ac5010ae | Richard Berger | Fix typos in tools folder | Mar 6 2017 | |||
17486a9319f8 | Richard Berger | Convert USER/lb/polymer files to UNIX line endings and remove trailing… | Mar 6 2017 | |||
778a79b8eef7 | Richard Berger | Fix typos in examples folder | Mar 6 2017 | |||
7dd60f97377a | Richard Berger | Fix typos in src files | Mar 6 2017 | |||
084d831bce01 | Richard Berger | Second batch of spelling fixes in manual | Mar 6 2017 | |||
e261bef7bba7 | Richard Berger | Spelling fixes in source files | Mar 6 2017 | |||
fd78486086d9 | Richard Berger | First batch of spelling fixes in manual | Mar 6 2017 | |||
6382d3c89a2f | Stan Moore | Improving memory access in comm_kokkos | Mar 3 2017 | |||
ce1a3f25e193 | Axel Kohlmeyer | Merge branch 'pair_write_fix' of https://github.com/andeplane/lammps into small… | Mar 3 2017 | |||
eaf7ed770750 | Anders Hafreager | Print error if pair_write does not get correct number of arguments | Mar 3 2017 | |||
8a0e44db83de | Jaap Kroes | updated documentation and ev_tally | Mar 1 2017 | |||
3ac74a1d6995 | Axel Kohlmeyer | update lammps.book file for latest doc changes | Feb 28 2017 | |||
3605208a45bb | Axel Kohlmeyer | add a few more missing details for integrating pair style kolmogorov/crespi/z | Feb 28 2017 | |||
9b01949cacfc | Axel Kohlmeyer | make the introduction of the command-by-category list less confusing | Feb 28 2017 | |||
323570c92036 | Jaap Kroes | added jpg for kolmogorov-crespi-z equations and fixed hybrid/overlay check in… | Feb 28 2017 | |||
df13a7a00382 | Jaap Kroes | email added | Feb 28 2017 | |||
a1b40b902d3e | Jaap Kroes | Added Kolmogorov-Crespi potential | Feb 28 2017 | |||
b921b69f4792 | Axel Kohlmeyer | implement bugfix from issue #388 | Feb 28 2017 | |||
c0cf50bce551 | Axel Kohlmeyer | trigger recomputing ichunk between runs unless requested otherwise | Feb 28 2017 | |||
2708c8683626 | Axel Kohlmeyer | fix typos: moleclue -> molecule | Feb 28 2017 | |||
9999f363a1f8 | Axel Kohlmeyer | remove outdated log files, too. | Feb 24 2017 | |||
a18b4ef4b0cf | Axel Kohlmeyer | update AGNI potential for Al, reference runs and output and citation | Feb 24 2017 | |||
20a9ffe69dfd | Axel Kohlmeyer | improve consistency and resolve dead links for USER-CGDNA related doc files | Feb 22 2017 | |||
904609a7a3a5 | Markus Hoehnerbach | Fixed issue with switching function derivative in PairAIREBO::FLJ | Feb 15 2017 | |||
fc3505fac47d | Markus Hoehnerbach | Fixed a number of issues after verifying against the KIM version | Feb 15 2017 | |||
a323ca1edd79 | Markus Hoehnerbach | Moved variable declarations to front for consistency | Feb 13 2017 | |||
de4af6f15d6a | Markus Hoehnerbach | In PairAIREBO::bondorderLJ correct omega sum d/drij. | Feb 13 2017 | |||
0e16dc3ead0b | Markus Hoehnerbach | In PairAIREBO::bondorderLJ: p^sigma pi account for d/drij derivatives. | Feb 13 2017 | |||
1b3f6e257a88 | Markus Hoehnerbach | In PairAIREBO::bondorderLJ only compute torsion term once. | Feb 13 2017 |