Commit Graph

11287 Commits

Author SHA1 Message Date
04f5eadcf1 added LAST option to dump_modify thresh, more restart info printed out to screen patch_11Oct2016 2016-10-11 12:39:52 -06:00
e70d530c46 Merge pull request #203 from rbberger/txt2rst-external-link-fix
txt2rst external link fix
2016-10-10 13:59:27 -06:00
ed8cc82713 Merge pull request #211 from akohlmey/add-respa-to-fix-flow-gauss
Add respa support to fix flow/gauss
2016-10-10 13:59:01 -06:00
27dac02466 Merge pull request #209 from akohlmey/static-double-deallocation-workaround
workaround for double free issue when using USER-COLVARS with with lammps python wrapper and python package
2016-10-10 13:58:16 -06:00
467bcad0a0 Merge pull request #204 from rbberger/fix-user-omp
Migrate changes from GRANULAR to USER-OMP
2016-10-10 13:57:37 -06:00
144e6a8091 whitespace cleanup 2016-10-10 09:40:09 -04:00
72ac073412 edited documentation
(cherry picked from commit eff14c74b0)
2016-10-10 09:38:54 -04:00
49c45ab03b edited documentation
(cherry picked from commit fd560889c3)
2016-10-10 09:38:53 -04:00
c2cd439944 first draft of documentation for respa
(cherry picked from commit d7dcbcfbd9)
2016-10-10 09:38:53 -04:00
e96ebb29bc adjusted default respa level to be outermost
(cherry picked from commit 7fc4d46a41)
2016-10-10 09:38:53 -04:00
3ce178d43f now understand how respa works in lammps
(cherry picked from commit c829027e83)
2016-10-10 09:38:52 -04:00
23781d6ec9 added respa to fix_flow_gauss, not fully understood yet
(cherry picked from commit 8d9737b04d)
2016-10-10 09:38:52 -04:00
fca6d721c0 completed synchronization with non-threaded version 2016-10-10 09:16:21 -04:00
dd192ca7ea whitespace cleanup 2016-10-10 09:15:42 -04:00
683689c808 revert to previous style conventions for size_t constants 2016-10-08 11:00:23 -04:00
e01e90eb96 workaround for double free issue when using USER-COLVARS with lammps code loaded as shared library into a standalone executable 2016-10-08 10:45:22 -04:00
615a2da044 Migrate changes from GRANULAR to USER-OMP 2016-10-06 21:48:06 -04:00
7f3a7c5cbe Fix broken link 2016-10-06 20:33:24 -04:00
e78b4267b7 Fix issue with external links containing anchors 2016-10-06 20:29:07 -04:00
e9fed80928 Merge pull request #202 from akohlmey/doc-formatting-fixes
collected documentation updates and corrections from LAMMPS-ICMS
patch_6Oct2016
2016-10-06 15:49:44 -06:00
54fc194e5b Merge pull request #199 from akohlmey/small-changes
Collected small changes and bugfixes
2016-10-06 15:49:24 -06:00
b3d2fb91bb new fix wall/gran/region command, REBO bug fix, new example log files 2016-10-06 15:47:41 -06:00
19984c9bd1 Revert "bugfix for AngleAngle term in CLASS2 impropers by Ivan A. Strelnikov, ICP RAS"
This reverts commit 83bcdb6a50.
2016-10-06 17:23:10 -04:00
f92618a33b Revert "bugfix for virial tally for improper style umbrella from Steven Vandenbrande (U Gent)"
This reverts commit 4921dc18a0.
2016-10-06 17:21:38 -04:00
0b5d71537a collected documentation updates and corrections from LAMMPS-ICMS
fixes formatting issues due to tabs, permission issues and
a few typos and badly worded text.
2016-10-06 15:48:18 -04:00
c213457550 Merge pull request #197 from giacomofiorin/colvars_2016-10-05
Colvars 2016-10-05
2016-10-06 13:02:52 -06:00
0f45cd61a5 Merge pull request #196 from akohlmey/charmm-cmap-updates
Some more cmap-related updates for ch2lmp
2016-10-06 13:02:27 -06:00
493873fb93 clean up doc src 2016-10-06 13:00:46 -06:00
60a031ebac Merge branch 'USER-DPD_pair_exp6_rx_mathfix' of https://github.com/timattox/lammps_USER-DPD into small-changes
This closes #201
2016-10-06 14:28:08 -04:00
27e76a70b9 Merge branch 'USER-DPD_hybrid_atom_bugfix' of https://github.com/timattox/lammps_USER-DPD into small-changes
This closes #200
2016-10-06 14:27:27 -04:00
e1e9a5c126 USER-DPD: math corrections in pair_exp6_rx.cpp (by Jim Larentzos) 2016-10-06 13:49:47 -04:00
d31121b18c USER-DPD: bugfix in unpack_comm_hybrid(); now works with hybrid atom style 2016-10-06 13:21:27 -04:00
0853cdbe6f update reference data files for updated/corrected clayff parameters 2016-10-06 11:47:08 -04:00
83bcdb6a50 bugfix for AngleAngle term in CLASS2 impropers by Ivan A. Strelnikov, ICP RAS
this closes #56
2016-10-06 11:27:18 -04:00
22ce671804 improved whitespace handling in msi2lmp for force fields and topologies 2016-10-06 11:16:59 -04:00
4921dc18a0 bugfix for virial tally for improper style umbrella from Steven Vandenbrande (U Gent)
this closes #182
2016-10-06 10:47:08 -04:00
d133167bf6 Merge branch 'master' of https://github.com/albapa/lammps into small-changes
USER-QUIP related improvements from github user albapa. This closes #198
2016-10-06 09:32:50 -04:00
8ea063378e add NETCDF libs (as defined in QUIP) to the linking line if QUIP was built with NETCDF support 2016-10-06 12:16:25 +01:00
fd16118cbb removed dump_modify command 2016-10-06 12:02:41 +01:00
f9f955d5b5 update include statement format 2016-10-05 22:34:44 -04:00
d7d321a512 some more updates to the README file to reflect the inclusion of the CMAP example and renamed file names 2016-10-05 18:41:45 -04:00
8809a603fb Colvars update: issue a warning that cannot be ignored regarding total forces 2016-10-05 18:26:21 -04:00
969d3cf4b0 Colvars update: make ABF check that the colvar isn't using already subtractAppliedForce 2016-10-05 18:25:40 -04:00
326fdf2cf1 added 1GB1 example from Robert Latour and update 1AC7 example files 2016-10-05 18:20:09 -04:00
f32819dd10 added tweak to write out the command line used for the conversion to the beginning of the LAMMPS input 2016-10-05 18:13:46 -04:00
c07a01c661 import updated README file for charmm2lammps.pl with CMAP support 2016-10-05 18:11:52 -04:00
02bfa898ee adjustments to balancing weights and factors, also XOR op for formulas, if, dump_modify thresh patch_5Oct2016 2016-10-05 15:46:20 -06:00
030df745bc Merge pull request #193 from akohlmey/eam-bugfix
bugfix for eam/alloy/omp and eam/fs/omp
2016-10-05 10:54:36 -06:00
6a97211932 Merge pull request #192 from rbberger/python-interface-bugfix
Revert type checking commit from July
2016-10-05 10:54:08 -06:00
c46be7db62 changes to imbalance weight factors 2016-10-05 10:33:39 -06:00