Homec4science
Diffusion lammps 39a12b15d7ea

Merge branch 'master' into new-neighbor
39a12b15d7ea
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 7 2016, 19:40.

Description

Merge branch 'master' into new-neighbor

Resolved Conflicts:
src/Purge.list
src/neigh_derive.cpp

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Dec 7 2016, 19:40
Pushed
jungeOct 19 2017, 09:53
Parents
rLAMMPSebabc8f0bc3b: Merge remote-tracking branch 'lammps-rw/integration' into update-neighbor
rLAMMPSfb3f597f411c: 30Nov16 patch
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS39a12b15d7ea: Merge branch 'master' into new-neighbor (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 7 2016, 19:40

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
fb3f597f411cSteve Plimpton
30Nov16 patch 
Nov 30 2016
d14814ae2efesjplimp/GitHub
Merge pull request #289 from akohlmey/collected-updates-and-bugfixes 
Nov 30 2016
beb5a30f6750Steve Plimpton
new compute global/atom command, also bug fix for descending dump sorts 
Nov 30 2016
7ddb6670c02aAxel Kohlmeyer
fix typo 
Nov 30 2016
789e62388f44Axel Kohlmeyer
simplify code 
Nov 29 2016
7d098bff90d4Jakub Krajniak/Axel Kohlmeyer
update format 
Nov 29 2016
1d970d3cdf50Jakub Krajniak/Axel Kohlmeyer
dihedral_nharmonic: added writing coefficient by write_data 
Nov 29 2016
42d430168b8aAxel Kohlmeyer
fix typo in compute cluster/atom docs 
Nov 29 2016
5ff5bc2a6ce2Axel Kohlmeyer
avoid issues detected by coverity scan 
Nov 29 2016
02ae2d218af5Axel Kohlmeyer
correct broken link to USER-SMD docs PDF 
Nov 28 2016
470908fc939dAxel Kohlmeyer
explicitly disallow dynamic groups with compute rdf 
Nov 24 2016
6759630c1680Steve Plimpton
bug fix for dump sort in descending order 
Nov 24 2016
87781771baf8Axel Kohlmeyer
fix typo and USER-OMP support omission 
Nov 23 2016
df46b9aa38fcAxel Kohlmeyer
rename compute pressure/grem to compute PRESSURE/GREM 
Nov 22 2016
647c6f00ce2bAxel Kohlmeyer
Merge branch 'grem-feature' of https://github.com/dstelter92/lammps into… 
Nov 22 2016
237307eda238dstelter92
small typo and changes 
Nov 22 2016
d58dd4f15989dstelter92
bugfix when parsing mpirun 
Nov 22 2016
ae70f1090f18dstelter92
added readme for grem examples 
Nov 22 2016
59d100ab57f6Steve Plimpton
final prep for 22Nov patch 
Nov 22 2016
61e71d23ededsjplimp/GitHub
Merge pull request #288 from akohlmey/moltemplate-1.40 
Nov 22 2016
b6f2f0e6e95fsjplimp/GitHub
Merge pull request #287 from rbberger/pylammps/docs 
Nov 22 2016
ff0441ac164esjplimp/GitHub
Merge pull request #286 from akohlmey/small-fixes-and-updates 
Nov 22 2016
41907d3110desjplimp/GitHub
Merge pull request #285 from akohlmey/fix-ipi-update 
Nov 22 2016
b95f255af4d4Steve Plimpton
small changes to temper/grem commands 
Nov 22 2016
d7b542101ae8sjplimp/GitHub
Merge pull request #283 from akohlmey/grem-feature 
Nov 22 2016
0ffa50f8e87aSteve Plimpton
tweaked author syntax 
Nov 22 2016
78932159642fAxel Kohlmeyer
small comment/whitespace tweak 
Nov 21 2016
3dff9f20184edstelter92
removed extra file 
Nov 21 2016
dab232c542c1dstelter92
modified temper_grem name to fit conventions, re-ran example to match 
Nov 21 2016
9e9d9d5aa541Axel Kohlmeyer
update bundled version of moltemplate to v1.40 
Nov 21 2016
c982b174a236Axel Kohlmeyer/GitHub
Merge pull request #49 from epfl-cosmo/fix-ipi 
Nov 20 2016
87a5a35bad56Michele Ceriotti
A tiny bugfix for the reset flag, and a brief explanation of the changes 
Nov 20 2016
fd174ce2b1bcMichele Ceriotti
Merge branch 'fix-ipi-update' of https://github.com/akohlmey/lammps into fix-ipi 
Nov 20 2016
b11f376a4f89Michele Ceriotti
Merge branch 'master' of github.com:lammps/lammps 
Nov 19 2016
230b29eae652Axel Kohlmeyer
correct accelerator flags for dpd styles in pair style overview 
Nov 19 2016
2383c31f1565Richard Berger
Created PyLammps documentation 
Nov 19 2016
e175a18bdbd0Axel Kohlmeyer
be more thorough in initializing optional data in pair style dpd/fdt/energy 
Nov 18 2016
a5bde82e3759Axel Kohlmeyer
update .gitignore for recent addition 
Nov 18 2016
d787afcca964Axel Kohlmeyer
also remove generated html files with 'make clean' in docs folder 
Nov 18 2016
176cde8ed32bAxel Kohlmeyer
minor cleanups 
Nov 18 2016
2862c2081501Axel Kohlmeyer
Merge branch 'master' into grem-feature 
Nov 18 2016
78e018829fd2Axel Kohlmeyer
Merge branch 'grem-feature' of https://github.com/dstelter92/lammps into grem… 
Nov 18 2016
c78914e7b334Axel Kohlmeyer
update for fix ipi from michele ceriotti 
Nov 18 2016
635f3ce128ecAxel Kohlmeyer
synchronize USER-SMD examples with code 
Nov 18 2016
81f68e06fde9Axel Kohlmeyer
Merge branch 'master' into doc-updates 
Nov 18 2016
4b51719e67c2Steve Plimpton
new 17Nov16 patch and stable 
Nov 18 2016
25d7be5f3dd5Steve Plimpton
compute pressure doc change 
Nov 18 2016
2a026c9ad8eadstelter92
revised temper_grem example, better file management 
Nov 17 2016
4a3091f844efdstelter92
modified temper_grem example with more exchanges 
Nov 17 2016
74c0e4dd5c10sjplimp/GitHub
Merge pull request #278 from akohlmey/pair-agni 
Nov 17 2016

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.
c4science · Help