Merge "Noting that and why gmxdump -s -sys is broken" into release-4-5-patches

diff --git a/src/gmxlib/mtop_util.c b/src/gmxlib/mtop_util.c
index adc441209eb725cb9cee92580beeaaa0f8825b72..e29c3ed18201c16fcc046c644722ea10735365b4 100644 (file)
--- a/src/gmxlib/mtop_util.c
+++ b/src/gmxlib/mtop_util.c
@@ -841,6 +841,8 @@ static void gen_local_top(const gmx_mtop_t *mtop,const t_inputrec *ir,
         }
         if (idef->il[F_POSRES].nr > nposre_old)
         {
+            /* Executing this line line stops gmxdump -sys working
+             * correctly. I'm not aware there's an elegant fix. */
             set_posres_params(idef,molb,nposre_old/2,natoms);
         }
 

diff --git a/src/kernel/gmxdump.c b/src/kernel/gmxdump.c
index 4e99088d8415146d18e2c0c5396eea21c3565533..c7a1918029a1a34fa52ae358ec0705ce8b962938 100644 (file)
--- a/src/kernel/gmxdump.c
+++ b/src/kernel/gmxdump.c
@@ -469,6 +469,9 @@ int main(int argc,char *argv[])
     "Note that currently setting [TT]GMXLIB[tt] is the only way to customize",
     "directories used for searching include files.",
   };
+  const char *bugs[] = {
+    "Position restraint output from -sys -s is broken"
+  };
   t_filenm fnm[] = {
     { efTPX, "-s", NULL, ffOPTRD },
     { efTRX, "-f", NULL, ffOPTRD },
@@ -493,7 +496,7 @@ int main(int argc,char *argv[])
   
   CopyRight(stderr,argv[0]);
   parse_common_args(&argc,argv,0,NFILE,fnm,asize(pa),pa,
-                   asize(desc),desc,0,NULL,&oenv);
+                    asize(desc),desc,asize(bugs),bugs,&oenv);
 
 
   if (ftp2bSet(efTPX,NFILE,fnm))