Merge branch 'master' into USER-DPD_kokkos: up to date to 30Nov16 patch
Description
Description
Details
Details
- Committed
Tim Mattox <timothy.mattox@engilitycorp.com> Nov 30 2016, 22:57 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS6e6776f39635: Finish moving/integrating atom_vec_dpd_kokkos into the Kokkos package
rLAMMPSfb3f597f411c: 30Nov16 patch - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
fb3f597f411c | Steve Plimpton | 30Nov16 patch | Nov 30 2016 | |||
d14814ae2efe | sjplimp/GitHub | Merge pull request #289 from akohlmey/collected-updates-and-bugfixes | Nov 30 2016 | |||
beb5a30f6750 | Steve Plimpton | new compute global/atom command, also bug fix for descending dump sorts | Nov 30 2016 | |||
7ddb6670c02a | Axel Kohlmeyer | fix typo | Nov 30 2016 | |||
789e62388f44 | Axel Kohlmeyer | simplify code | Nov 29 2016 | |||
7d098bff90d4 | Jakub Krajniak/Axel Kohlmeyer | update format | Nov 29 2016 | |||
1d970d3cdf50 | Jakub Krajniak/Axel Kohlmeyer | dihedral_nharmonic: added writing coefficient by write_data | Nov 29 2016 | |||
42d430168b8a | Axel Kohlmeyer | fix typo in compute cluster/atom docs | Nov 29 2016 | |||
5ff5bc2a6ce2 | Axel Kohlmeyer | avoid issues detected by coverity scan | Nov 29 2016 | |||
02ae2d218af5 | Axel Kohlmeyer | correct broken link to USER-SMD docs PDF | Nov 28 2016 | |||
470908fc939d | Axel Kohlmeyer | explicitly disallow dynamic groups with compute rdf | Nov 24 2016 | |||
6759630c1680 | Steve Plimpton | bug fix for dump sort in descending order | Nov 24 2016 | |||
87781771baf8 | Axel Kohlmeyer | fix typo and USER-OMP support omission | Nov 23 2016 | |||
df46b9aa38fc | Axel Kohlmeyer | rename compute pressure/grem to compute PRESSURE/GREM | Nov 22 2016 | |||
647c6f00ce2b | Axel Kohlmeyer | Merge branch 'grem-feature' of https://github.com/dstelter92/lammps into… | Nov 22 2016 | |||
237307eda238 | dstelter92 | small typo and changes | Nov 22 2016 | |||
d58dd4f15989 | dstelter92 | bugfix when parsing mpirun | Nov 22 2016 | |||
ae70f1090f18 | dstelter92 | added readme for grem examples | Nov 22 2016 | |||
59d100ab57f6 | Steve Plimpton | final prep for 22Nov patch | Nov 22 2016 | |||
61e71d23eded | sjplimp/GitHub | Merge pull request #288 from akohlmey/moltemplate-1.40 | Nov 22 2016 | |||
b6f2f0e6e95f | sjplimp/GitHub | Merge pull request #287 from rbberger/pylammps/docs | Nov 22 2016 | |||
ff0441ac164e | sjplimp/GitHub | Merge pull request #286 from akohlmey/small-fixes-and-updates | Nov 22 2016 | |||
41907d3110de | sjplimp/GitHub | Merge pull request #285 from akohlmey/fix-ipi-update | Nov 22 2016 | |||
b95f255af4d4 | Steve Plimpton | small changes to temper/grem commands | Nov 22 2016 | |||
d7b542101ae8 | sjplimp/GitHub | Merge pull request #283 from akohlmey/grem-feature | Nov 22 2016 | |||
0ffa50f8e87a | Steve Plimpton | tweaked author syntax | Nov 22 2016 | |||
78932159642f | Axel Kohlmeyer | small comment/whitespace tweak | Nov 21 2016 | |||
3dff9f20184e | dstelter92 | removed extra file | Nov 21 2016 | |||
dab232c542c1 | dstelter92 | modified temper_grem name to fit conventions, re-ran example to match | Nov 21 2016 | |||
9e9d9d5aa541 | Axel Kohlmeyer | update bundled version of moltemplate to v1.40 | Nov 21 2016 | |||
c982b174a236 | Axel Kohlmeyer/GitHub | Merge pull request #49 from epfl-cosmo/fix-ipi | Nov 20 2016 | |||
87a5a35bad56 | Michele Ceriotti | A tiny bugfix for the reset flag, and a brief explanation of the changes | Nov 20 2016 | |||
fd174ce2b1bc | Michele Ceriotti | Merge branch 'fix-ipi-update' of https://github.com/akohlmey/lammps into fix-ipi | Nov 20 2016 | |||
b11f376a4f89 | Michele Ceriotti | Merge branch 'master' of github.com:lammps/lammps | Nov 19 2016 | |||
230b29eae652 | Axel Kohlmeyer | correct accelerator flags for dpd styles in pair style overview | Nov 19 2016 | |||
2383c31f1565 | Richard Berger | Created PyLammps documentation | Nov 19 2016 | |||
e175a18bdbd0 | Axel Kohlmeyer | be more thorough in initializing optional data in pair style dpd/fdt/energy | Nov 18 2016 | |||
a5bde82e3759 | Axel Kohlmeyer | update .gitignore for recent addition | Nov 18 2016 | |||
d787afcca964 | Axel Kohlmeyer | also remove generated html files with 'make clean' in docs folder | Nov 18 2016 | |||
176cde8ed32b | Axel Kohlmeyer | minor cleanups | Nov 18 2016 | |||
2862c2081501 | Axel Kohlmeyer | Merge branch 'master' into grem-feature | Nov 18 2016 | |||
78e018829fd2 | Axel Kohlmeyer | Merge branch 'grem-feature' of https://github.com/dstelter92/lammps into grem… | Nov 18 2016 | |||
c78914e7b334 | Axel Kohlmeyer | update for fix ipi from michele ceriotti | Nov 18 2016 | |||
635f3ce128ec | Axel Kohlmeyer | synchronize USER-SMD examples with code | Nov 18 2016 | |||
81f68e06fde9 | Axel Kohlmeyer | Merge branch 'master' into doc-updates | Nov 18 2016 | |||
2a026c9ad8ea | dstelter92 | revised temper_grem example, better file management | Nov 17 2016 | |||
4a3091f844ef | dstelter92 | modified temper_grem example with more exchanges | Nov 17 2016 | |||
747c95c52528 | dstelter92 | revised documentation, added temper_grem ref to fix_grem | Nov 17 2016 | |||
5c64934bc812 | dstelter92 | added documention, re-ran temper_grem example | Nov 17 2016 | |||
4e62e58d291d | Axel Kohlmeyer/GitHub | Merge pull request #47 from dstelter92/grem-feature | Nov 17 2016 |