From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Mon, 29 Sep 2014 15:31:09 +0000 (+0200)
Subject: Merge "Merge release-4-6 into release-5-0" into release-5-0
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=4e26aee50b6476a4c01c0eaf3650b1766e9b1659;hp=d3e2d78f5c42e4ad8c3d6dabf7a6d909b2a9c280;p=alexxy%2Fgromacs.git

Merge "Merge release-4-6 into release-5-0" into release-5-0
---

diff --git a/src/gromacs/gmxpreprocess/toppush.c b/src/gromacs/gmxpreprocess/toppush.c
index fd2a8a1595..fab21dda51 100644
--- a/src/gromacs/gmxpreprocess/toppush.c
+++ b/src/gromacs/gmxpreprocess/toppush.c
@@ -600,9 +600,11 @@ static void push_bondtype(t_params     *       bt,
                     {
                         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);
-                        fprintf(stderr, "  old:");
+                        fprintf(stderr, "  old:                                         ");
                         for (j = 0; (j < nrfp); j++)
                         {
                             fprintf(stderr, " %g", bt->param[i].c[j]);