Update to oxDNA2
Description
Description
Details
Details
- Committed
Oliver Henrich <o.henrich@epcc.ed.ac.uk> Mar 28 2017, 19:22 - Pushed
junge Oct 19 2017, 09:53 - Parents
- rLAMMPS8afed61db1c8: Upgrade to oxDNA2
rLAMMPS3dfe4505ddcb: 24Mar17 patch sync with SVN - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
3dfe4505ddcb | Steve Plimpton | 24Mar17 patch sync with SVN | Mar 24 2017 | |||
394e9b42b06a | Steve Plimpton | new CHARMM pair styles with force swithing/shifting | Mar 24 2017 | |||
e6fcaefe95d3 | sjplimp/GitHub | Merge pull request #431 from v0i0/fix-airebo-morse | Mar 24 2017 | |||
f5a85d68add0 | sjplimp/GitHub | Merge pull request #429 from akohlmey/updates-for-stable | Mar 24 2017 | |||
277b93cb8956 | sjplimp/GitHub | Merge pull request #417 from tonnamb/add-pair-zhou | Mar 24 2017 | |||
8820315ff96a | Axel Kohlmeyer | Merge branch 'master' into updates-for-stable | Mar 23 2017 | |||
44841f689127 | Steve Plimpton | fix ave/chunk fixes, 2d disc option, fix_modify dynamic/dof | Mar 23 2017 | |||
2cdcd6d63045 | Axel Kohlmeyer | remove one more reference to xmovie | Mar 23 2017 | |||
47cade2bcff2 | Axel Kohlmeyer | re-arranged functions to make it easier to compare with non-threaded. port… | Mar 23 2017 | |||
a72efbea3699 | Axel Kohlmeyer | whitespace cleanup | Mar 23 2017 | |||
5c9892c083dd | Axel Kohlmeyer | apply airebo/m bugfix also to USER-OMP version | Mar 23 2017 | |||
9ecc5c8cf7aa | Axel Kohlmeyer | Merge branch 'fix-airebo-morse' of https://github.com/v0i0/lammps into pull-431 | Mar 23 2017 | |||
47cebb0d2339 | Markus Hoehnerbach | And getting it right... | Mar 23 2017 | |||
f127e428ccca | Markus Hoehnerbach | Fix airebo/morse | Mar 23 2017 | |||
568b67eee9cb | Axel Kohlmeyer | include citation for reference paper into pair style momb | Mar 23 2017 | |||
865b41e2014e | Axel Kohlmeyer | make pair style momb example follow LAMMPS conventions more closely | Mar 23 2017 | |||
b88a7496808b | Axel Kohlmeyer | rename a couple more references to pair style zhou into momb | Mar 23 2017 | |||
02e65900e6ef | Tonnam Balankura | add example log file generated from 17Nov16 version of lammps, make minimize… | Mar 23 2017 | |||
343c9eda82d3 | Tonnam Balankura | change zhou to momb in src/USER-MISC/README | Mar 23 2017 | |||
df8dbec67653 | Tonnam Balankura | rename pair_zhou to pair_momb in src and change class name from PairZhou to… | Mar 23 2017 | |||
1075be7eca96 | Tonnam Balankura | rename zhou to momb in examples | Mar 23 2017 | |||
6d395ec511b3 | Tonnam Balankura | change name zhou to momb in docs, fix grammar | Mar 23 2017 | |||
bf560e78f348 | Tonnam Balankura | edit description and add related commands and default | Mar 22 2017 | |||
daae76c46505 | Tonnam Balankura | Add names Tonnam and Ya to README | Mar 22 2017 | |||
1ea9a14121ca | Tonnam Balankura | Add Tonnam and Ya names | Mar 22 2017 | |||
1db5834b99d0 | Axel Kohlmeyer | Revert "Cleanup of a few more references to obsoleted and removed tools like… | Mar 22 2017 | |||
3070b043be1b | Axel Kohlmeyer | Revert "correct inconsistent anchors" | Mar 22 2017 | |||
ef3f323fc47d | Axel Kohlmeyer | Revert "remove reference to removed section on VMD scripts" | Mar 22 2017 | |||
43a304f56451 | Axel Kohlmeyer | remove reference to removed section on VMD scripts | Mar 22 2017 | |||
a79aef65e84a | Axel Kohlmeyer | correct inconsistent anchors | Mar 22 2017 | |||
dc1d93a49108 | Axel Kohlmeyer | some more whitespace cleanup | Mar 22 2017 | |||
66eb9c248620 | Axel Kohlmeyer | remove reference to removed section on VMD scripts | Mar 22 2017 | |||
a14d58259c3e | Axel Kohlmeyer | correct inconsistent anchors | Mar 22 2017 | |||
127597023df5 | Axel Kohlmeyer | Cleanup of a few more references to obsoleted and removed tools like xmovie | Mar 22 2017 | |||
3ec16f3630c4 | Axel Kohlmeyer | fully integrate support for doc_anchor_check into docs makefile | Mar 22 2017 | |||
cb9059652daa | Axel Kohlmeyer | a few more small changes to integrate pair style zhou properly | Mar 22 2017 | |||
43f27250b5a5 | Axel Kohlmeyer | Merge branch 'add-pair-zhou' of https://github.com/tonnamb/lammps into pull-417 | Mar 22 2017 | |||
c5d561a31260 | Tonnam Balankura | pair_zhou docs: add equation, add link in section_commands and pairs | Mar 22 2017 | |||
734e639c5d9d | Axel Kohlmeyer | correct typo reported on lammps-users | Mar 21 2017 | |||
dcede304dff9 | Steve Plimpton | changes for next patch, 2d disc options for spheres, fix external upgrade, bug… | Mar 21 2017 | |||
145e682ad386 | sjplimp/GitHub | Merge pull request #427 from akohlmey/small-updates-and-corrections | Mar 21 2017 | |||
6482df6c2fbf | Axel Kohlmeyer | remove references to deleted tools. update/clarify section on restart2data | Mar 20 2017 | |||
0c9cd11b4e95 | Axel Kohlmeyer | have the relevant LAMMPS version embedded into top part of the html manual | Mar 20 2017 | |||
82d952ae0eaf | Axel Kohlmeyer | mention NumPy dependency instead of Numeric for python tools | Mar 20 2017 | |||
47d6451d033a | Axel Kohlmeyer | fix compilation for pymol_asphere tool | Mar 20 2017 | |||
e110d6961a48 | Axel Kohlmeyer | remove obsolete tools and files | Mar 20 2017 | |||
a42b0b7dcb59 | Axel Kohlmeyer | update colvars abf integrate tool from git repo | Mar 20 2017 | |||
03828b5836f5 | Axel Kohlmeyer | adapt binary2txt.cpp source to current coding conventions | Mar 20 2017 | |||
3b44c3ff1d5f | Axel Kohlmeyer | remove non-ASCII characters from doc source files | Mar 20 2017 | |||
0d0c2b65f763 | Axel Kohlmeyer | correct stan's email address | Mar 20 2017 |