Merge gromacs-4-6 into master

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / pgutil.c

diff --git a/src/gromacs/gmxpreprocess/pgutil.c b/src/gromacs/gmxpreprocess/pgutil.c
index 4936bfdc1d9408e8560b49ea1324d98127be932e..404f9ed5fca73b090deb0829d57229d592ba23ef 100644 (file)
--- a/src/gromacs/gmxpreprocess/pgutil.c
+++ b/src/gromacs/gmxpreprocess/pgutil.c
@@ -48,13 +48,16 @@ static void atom_not_found(int fatal_errno,const char *file,int line,
 {
   if (strcmp(bondtype,"check") != 0) {
     if (bDontQuit) {
-      fprintf(stderr,
-             "WARNING: atom %s not found in residue seq.nr. %d while adding %s\n",
-             atomname,resind+1,bondtype);
+      gmx_warning("WARNING: Atom %s is used in an interaction of type %s in the\n"
+                 "topology database, but an atom of that name was not found in\n"
+                 "residue number %d.\n",
+                 atomname,bondtype,resind+1);
     } else {
       gmx_fatal(fatal_errno,file,line,
-               "Atom %s not found in residue seq.nr. %d while adding %s\n",
-               atomname,resind+1,bondtype);
+               "Atom %s is used in an interaction of type %s in the topology\n"
+               "database, but an atom of that name was not found in residue\n"
+               "number %d.\n",
+               atomname,bondtype,resind+1);
     }
   }
 }