Commit Graph

4586 Commits

Author SHA1 Message Date
b9d844ca8d Merge pull request #444 from ohenrich/user-cgdna
Minor updates to docu of USER-CGDNA package
2017-04-11 08:25:09 -06:00
84ea8a79e6 correct link for dispersion parameter how-to and reformat 2017-04-10 20:43:24 -04:00
497a5d88af Merge branch 'master' into user-cgdna 2017-04-04 20:03:57 +01:00
8993daaa31 Minor update to docu 2017-04-04 19:54:22 +01:00
28e86917a0 Made fix adapt work with bond_harmonic. 2017-04-04 12:35:26 -04:00
ae56b9ad89 patch 31Mar17 for stable release 2017-03-30 10:07:27 -06:00
c733204a70 Updated lammps.book and install script 2017-03-29 08:28:03 +01:00
4b9d0a9566 sync with SVN 2017-03-28 13:26:12 -06:00
0637f23875 patch 28Mar17 2017-03-28 13:12:23 -06:00
9f6e126a2f Merge pull request #437 from ohenrich/user-cgdna
User cgdna
2017-03-28 12:52:26 -06:00
80e5111dca Merge pull request #434 from akohlmey/imgflags-in-library
improved image flag handling in library interface
2017-03-28 12:50:13 -06:00
1d8f0c762d Merge branch 'master' into fixes-for-stable 2017-03-28 14:37:30 -04:00
111d350a22 fix gcmc units change for chemical potential 2017-03-28 12:34:46 -06:00
66a6375405 Resolved merge conflict 2017-03-28 18:58:31 +01:00
604afebf6f Update to oxDNA2 2017-03-28 18:22:02 +01:00
8afed61db1 Upgrade to oxDNA2 2017-03-28 18:16:36 +01:00
f8da9a866a synchronize dump custom/vtk documentation with that of dump custom 2017-03-28 11:00:22 -04:00
fc51c38abb add some docs for the special treatment of image flags 2017-03-28 02:22:45 -04:00
a241b2d0f7 fix problems with references 2017-03-27 15:01:32 -04:00
61e7595a94 remove references to xmovie, streamline dump and viz descriptions 2017-03-27 14:59:58 -04:00
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
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
7435084375 Verified oxDNA with modified nucleotide layout 2017-03-22 15:59:10 +00: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
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