Remove .tpa, .tpb, .tpx, .trj files. Part of #1500.

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

diff --git a/src/gromacs/gmxana/gmx_mk_angndx.c b/src/gromacs/gmxana/gmx_mk_angndx.c
index 9e684f300d7c22f945d9aebbe6c5d2b4b99a1e07..d27546891a013354a37e9a8c2e310471843c02f3 100644 (file)
--- a/src/gromacs/gmxana/gmx_mk_angndx.c
+++ b/src/gromacs/gmxana/gmx_mk_angndx.c
@@ -34,17 +34,15 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "gmxpre.h"
 
 #include <math.h>
-#include "typedefs.h"
+#include "gromacs/legacyheaders/typedefs.h"
 #include "gromacs/utility/smalloc.h"
 #include "gromacs/commandline/pargs.h"
-#include "macros.h"
-#include "gromacs/fileio/futil.h"
-#include "gmx_fatal.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/fatalerror.h"
 #include "gromacs/fileio/trxio.h"
 
 static int calc_ntype(int nft, int *ft, t_idef *idef)
@@ -131,7 +129,7 @@ static void fill_ft_ind(int nft, int *ft, t_idef *idef,
                         gmx_fatal(FARGS, "Unsupported function type '%s' selected",
                                   interaction_function[ftype].longname);
                 }
-                grpnames[ind] = strdup(buf);
+                grpnames[ind] = gmx_strdup(buf);
                 ind++;
             }
         }
@@ -274,7 +272,7 @@ int gmx_mk_angndx(int argc, char *argv[])
     int               *nr;
     char             **grpnames;
     t_filenm           fnm[] = {
-        { efTPX, NULL, NULL, ffREAD  },
+        { efTPR, NULL, NULL, ffREAD  },
         { efNDX, NULL, "angle", ffWRITE }
     };
 #define NFILE asize(fnm)
@@ -288,7 +286,7 @@ int gmx_mk_angndx(int argc, char *argv[])
 
     ft = select_ftype(opt[0], &nft, &mult);
 
-    top = read_top(ftp2fn(efTPX, NFILE, fnm), NULL);
+    top = read_top(ftp2fn(efTPR, NFILE, fnm), NULL);
 
     ntype = calc_ntype(nft, ft, &(top->idef));
     snew(grpnames, ntype);