Sort all includes in src/gromacs
[alexxy/gromacs.git] / src / gromacs / gmxana / gmx_spol.c
index af6ed8cc0db273b79d5497b6a71ffc12c619b11f..2def7422e5720f45d407115844a82978cb89c263 100644 (file)
  */
 #include "gmxpre.h"
 
-#include "gromacs/legacyheaders/macros.h"
-#include "gstat.h"
-#include "gromacs/legacyheaders/viewit.h"
-#include "gromacs/pbcutil/pbc.h"
-#include "gromacs/topology/index.h"
+#include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trxio.h"
-#include "gromacs/math/units.h"
-#include "gmx_ana.h"
-
-#include "gromacs/commandline/pargs.h"
 #include "gromacs/fileio/xvgr.h"
+#include "gromacs/gmxana/gmx_ana.h"
+#include "gromacs/gmxana/gstat.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/viewit.h"
+#include "gromacs/math/units.h"
 #include "gromacs/math/vec.h"
+#include "gromacs/pbcutil/pbc.h"
 #include "gromacs/pbcutil/rmpbc.h"
+#include "gromacs/topology/index.h"
 #include "gromacs/utility/fatalerror.h"
 #include "gromacs/utility/smalloc.h"
 
@@ -205,7 +204,7 @@ int gmx_spol(int argc, char *argv[])
 
     t_filenm        fnm[] = {
         { efTRX, NULL,  NULL,  ffREAD },
-        { efTPX, NULL,  NULL,  ffREAD },
+        { efTPR, NULL,  NULL,  ffREAD },
         { efNDX, NULL,  NULL,  ffOPTRD },
         { efXVG, NULL,  "scdist",  ffWRITE }
     };
@@ -219,7 +218,7 @@ int gmx_spol(int argc, char *argv[])
 
     snew(top, 1);
     snew(ir, 1);
-    read_tpx_top(ftp2fn(efTPX, NFILE, fnm),
+    read_tpx_top(ftp2fn(efTPR, NFILE, fnm),
                  ir, box, &natoms, NULL, NULL, NULL, top);
 
     /* get index groups */