Merge release-5-0 into master

[alexxy/gromacs.git] / src / gromacs / gmxana / gmx_trjconv.c

diff --git a/src/gromacs/gmxana/gmx_trjconv.c b/src/gromacs/gmxana/gmx_trjconv.c
index ca554147d99bc82dde1596b3520a5e59ca4df553..62726f169ba85cfa92a9639636435577b0fd046d 100644 (file)
--- a/src/gromacs/gmxana/gmx_trjconv.c
+++ b/src/gromacs/gmxana/gmx_trjconv.c
@@ -1033,9 +1033,10 @@ int gmx_trjconv(int argc, char *argv[])
         {
             /* check if velocities are possible in input and output files */
             ftpin = fn2ftp(in_file);
-            bVels = (ftp == efTRR || ftp == efTRJ || ftp == efGRO || ftp == efG96)
-                && (ftpin == efTRR || ftpin == efTRJ || ftpin == efGRO || ftpin == efG96 ||
-                    ftpin == efCPT);
+            bVels = (ftp == efTRR || ftp == efTRJ || ftp == efGRO ||
+                     ftp == efG96 || ftp == efTNG)
+                && (ftpin == efTRR || ftpin == efTRJ || ftpin == efGRO ||
+                    ftpin == efG96 || ftpin == efTNG || ftpin == efCPT);
         }
         if (bSeparate || bSplit)
         {