Commit Graph

3864 Commits

Author SHA1 Message Date
3dfe4505dd 24Mar17 patch sync with SVN 2017-03-24 15:17:51 -06:00
394e9b42b0 new CHARMM pair styles with force swithing/shifting 2017-03-24 13:53:07 -06:00
f5a85d68ad Merge pull request #429 from akohlmey/updates-for-stable
Collected updates for stable release
2017-03-24 10:01:23 -06:00
277b93cb89 Merge pull request #417 from tonnamb/add-pair-zhou
add new pair potential for metal-organic interactions - pair style momb
2017-03-24 09:41:30 -06:00
8820315ff9 Merge branch 'master' into updates-for-stable 2017-03-23 17:57:02 -04:00
44841f6891 fix ave/chunk fixes, 2d disc option, fix_modify dynamic/dof 2017-03-23 15:31:27 -06:00
2cdcd6d630 remove one more reference to xmovie 2017-03-23 16:03:25 -04:00
b88a749680 rename a couple more references to pair style zhou into momb 2017-03-23 11:38:33 -04:00
6d395ec511 change name zhou to momb in docs, fix grammar 2017-03-23 10:08:47 -04:00
bf560e78f3 edit description and add related commands and default 2017-03-22 16:56:40 -04:00
1db5834b99 Revert "Cleanup of a few more references to obsoleted and removed tools like xmovie"
This reverts commit 127597023d.
2017-03-22 15:12:49 -04:00
3070b043be Revert "correct inconsistent anchors"
This reverts commit a14d58259c.
2017-03-22 15:12:47 -04:00
ef3f323fc4 Revert "remove reference to removed section on VMD scripts"
This reverts commit 66eb9c2486.
2017-03-22 15:12:43 -04:00
43a304f564 remove reference to removed section on VMD scripts 2017-03-22 15:12:09 -04:00
a79aef65e8 correct inconsistent anchors 2017-03-22 15:12:09 -04:00
66eb9c2486 remove reference to removed section on VMD scripts 2017-03-22 15:01:11 -04:00
a14d58259c correct inconsistent anchors 2017-03-22 15:00:57 -04:00
127597023d Cleanup of a few more references to obsoleted and removed tools like xmovie 2017-03-22 14:57:37 -04:00
3ec16f3630 fully integrate support for doc_anchor_check into docs makefile 2017-03-22 14:40:30 -04:00
cb9059652d a few more small changes to integrate pair style zhou properly 2017-03-22 14:39:46 -04:00
43f27250b5 Merge branch 'add-pair-zhou' of https://github.com/tonnamb/lammps into pull-417 2017-03-22 14:05:16 -04:00
c5d561a312 pair_zhou docs: add equation, add link in section_commands and pairs 2017-03-22 12:00:32 -04:00
734e639c5d correct typo reported on lammps-users 2017-03-21 14:12:00 -04:00
dcede304df changes for next patch, 2d disc options for spheres, fix external upgrade, bug fixes for fix ave/chunk for density calcs, Aidan doc page citation deconvolution 2017-03-21 08:56:37 -06:00
6482df6c2f remove references to deleted tools. update/clarify section on restart2data 2017-03-20 18:57:30 -04:00
0c9cd11b4e have the relevant LAMMPS version embedded into top part of the html manual 2017-03-20 18:25:11 -04:00
3b44c3ff1d remove non-ASCII characters from doc source files 2017-03-20 16:55:14 -04:00
0d0c2b65f7 correct stan's email address 2017-03-20 16:32:16 -04:00
2218a9d704 emphasize that the online manual is following the latest development version 2017-03-20 16:32:04 -04:00
0a6b33cd78 remove duplicate paragraph in nose-hoover fix docs 2017-03-20 16:27:00 -04:00
52987a3615 Started writing pair_zhou.txt 2017-03-18 22:32:39 -04:00
4a90bca7a3 patch 17Mar17 2017-03-17 11:29:23 -06:00
fcc3b3bd36 Merge pull request #421 from akohlmey/memory-output
improve memory usage reporting in info and output class
2017-03-17 11:18:08 -06:00
53a3877c3d Merge pull request #420 from rbberger/doc_anchor_check
Add utility to detect duplicate anchors in docs
2017-03-17 11:17:28 -06:00
621d7d5ce0 Correct off-by-one error in line number reported 2017-03-16 23:05:03 -04:00
1bb9c7da42 Remove some duplicate anchors in documentation 2017-03-16 22:36:13 -04:00
f893104b18 Add anchor_check to doc Makefile 2017-03-16 22:21:55 -04:00
efb2a942e0 Add utility to detect duplicate anchors in documentation files 2017-03-16 22:21:12 -04:00
070ce33a13 improve memory usage reporting in info and output class 2017-03-16 18:35:04 -04:00
f604f86cfc add fix filter/corotate to some administrative files 2017-03-16 15:08:17 -04:00
0d8f74f0c5 Merge branch 'filter_corotate' of https://github.com/lukin17/lammps into pull-416 2017-03-15 18:54:41 -04:00
3a2da51a82 Merge pull request #413 from ohenrich/user-cgdna
User cgdna
2017-03-15 13:12:43 -06:00
b1c59126f7 Merge pull request #415 from stanmoore1/kk_qeq
Add neigh/qeq option to Kokkos package
2017-03-15 13:12:08 -06:00
4c77838514 Merge pull request #414 from sstrong99/flow-gauss-doc-addition
flow/gauss documentation update
2017-03-15 13:11:26 -06:00
c3ce3747e0 Added fix filter/corotate. 2017-03-15 11:34:01 +01:00
fdc390ad05 Tweaking docs for Kokkos package 2017-03-14 14:08:14 -06:00
580f6b567b Add neigh/qeq option to Kokkos 2017-03-14 10:44:31 -06:00
27b1c33a16 updated the NEMD discussion in the how-to documentation about flow/gauss 2017-03-14 10:39:06 -06:00
7a75cd111c Minor updates in documentation and setup tool, merge before upgrade to oxDNA2 2017-03-14 11:39:09 +00:00
23b8287933 Updated documentation and simple setup tool 2017-03-14 11:36:44 +00:00