Merge remote-tracking branch 'upstream/lammps-icms' into improved_python_interface
Description
Description
Details
Details
- Committed
Richard Berger <richard.berger@temple.edu> Jul 18 2016, 20:00 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS45204726d881: Revert to 2 spaces for Steve
rLAMMPS5519b38bd9ba: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
5519b38bd9ba | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | Jul 17 2016 | |||
a360b605f087 | Axel Kohlmeyer | explain workaround for replicate restrictions with fixes | Jul 17 2016 | |||
0ec028d9f26f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15339 f3b2605a-c512-4ea7… | Jul 17 2016 | |||
778ae37e6e53 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15338 f3b2605a-c512-4ea7… | Jul 17 2016 | |||
1111c8ba93c9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15337 f3b2605a-c512-4ea7… | Jul 17 2016 | |||
a6f62209af65 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15336 f3b2605a-c512-4ea7… | Jul 17 2016 | |||
89b839056c0e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15335 f3b2605a-c512-4ea7… | Jul 17 2016 | |||
596d6840a5eb | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15334 f3b2605a-c512-4ea7… | Jul 17 2016 | |||
a5b6dbea786f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15333 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
1c084bc4e517 | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | Jul 16 2016 | |||
d53616b6c837 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15331 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
4bf96ac144ec | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15330 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
ea3984356441 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15329 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
472fe29a8997 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15328 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
e6dc896b4979 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15327 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
80fce623ec65 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15326 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
a47e457ab0c1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15325 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
a2782baa64a7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15324 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
2705ddcaab9c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15323 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
638b0db5359e | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15322 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
8a4dc62d2c15 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15321 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
c79a24c7ef7a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15320 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
12f3178e868d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15319 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
eb78022b5a1a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15318 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
10bbb289435b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15317 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
1587bdf2f1b2 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15316 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
05398a68637a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15315 f3b2605a-c512-4ea7… | Jul 16 2016 | |||
d32f1ea4c0df | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15314 f3b2605a-c512-4ea7… | Jul 15 2016 | |||
e85587d25eca | Axel Kohlmeyer | Merge remote-tracking branch 'lammps-ro/master' into lammps-icms | Jul 15 2016 | |||
6925bfb2d4c9 | Axel Kohlmeyer | Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… | Jul 15 2016 | |||
85599812c491 | Axel Kohlmeyer | Merge branch 'pure_locals_plus_ndxAIR_ssa' of https://github. | Jul 14 2016 | |||
fbf361e478ce | Tim Mattox | USER-DPD: Process each AIR in the SSA without scanning the NeighList. Sorts… | Jul 14 2016 | |||
691cb955068b | Tim Mattox | Save build time since only non-pure locals can have ghost neighbors. | Jul 14 2016 | |||
f17037c61079 | Tim Mattox | USER-DPD: Track pure locals as AIR #0, and non-pure locals as AIR #1 Non-pure… | Jul 14 2016 | |||
ced05989ca34 | Axel Kohlmeyer | change python module formatting according to python guidelines and fix a couple… | Jul 14 2016 | |||
b59911779f14 | Axel Kohlmeyer | adapt info output for easier parsing | Jul 14 2016 | |||
d326e8a767d6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15313 f3b2605a-c512-4ea7… | Jul 14 2016 | |||
b399e2e496d4 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15312 f3b2605a-c512-4ea7… | Jul 14 2016 | |||
7d2809dd09b5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15311 f3b2605a-c512-4ea7… | Jul 14 2016 | |||
4e76c2da5338 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15310 f3b2605a-c512-4ea7… | Jul 14 2016 | |||
2f09c2755ae1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15309 f3b2605a-c512-4ea7… | Jul 14 2016 | |||
2f04cd2bc5d6 | Axel Kohlmeyer | add support for gaussian distributed particle insertion | Jul 14 2016 | |||
ae2194afb0b5 | Axel Kohlmeyer | allow floating point numbers for compute_modify extra | Jul 14 2016 | |||
422062a34006 | Axel Kohlmeyer | fix typo | Jul 14 2016 |