biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge release-5-0 into master
[alexxy/gromacs.git]
/
src
/
gromacs
/
gmxpreprocess
/
toppush.c
diff --git
a/src/gromacs/gmxpreprocess/toppush.c
b/src/gromacs/gmxpreprocess/toppush.c
index 161940b72e0f2a73267baeab449016d12247b67d..8272b7787ecf3f2dad111040e9d2ca76dca6b884 100644
(file)
--- a/
src/gromacs/gmxpreprocess/toppush.c
+++ b/
src/gromacs/gmxpreprocess/toppush.c
@@
-599,9
+599,11
@@
static void push_bondtype(t_params * bt,
{
sprintf(errbuf, "Overriding %s parameters.%s",
interaction_function[ftype].longname,
{
sprintf(errbuf, "Overriding %s parameters.%s",
interaction_function[ftype].longname,
- (ftype == F_PDIHS) ? "\nUse dihedraltype 4 to allow several multiplicity terms." : "");
+ (ftype == F_PDIHS) ?
+ "\nUse dihedraltype 9 to allow several multiplicity terms. Only consecutive lines are combined. Non-consective lines overwrite each other."
+ : "");
warning(wi, errbuf);
warning(wi, errbuf);
- fprintf(stderr, " old:");
+ fprintf(stderr, " old:
");
for (j = 0; (j < nrfp); j++)
{
fprintf(stderr, " %g", bt->param[i].c[j]);
for (j = 0; (j < nrfp); j++)
{
fprintf(stderr, " %g", bt->param[i].c[j]);