Sort all includes in src/gromacs

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

diff --git a/src/gromacs/gmxana/gmx_spol.c b/src/gromacs/gmxana/gmx_spol.c
index 53b6be27c20118023abee83c1bea1d851defd345..2def7422e5720f45d407115844a82978cb89c263 100644 (file)
--- a/src/gromacs/gmxana/gmx_spol.c
+++ b/src/gromacs/gmxana/gmx_spol.c
@@ -34,22 +34,21 @@
  * To help us fund GROMACS development, we humbly ask that you cite
  * the research papers on the package. Check out http://www.gromacs.org.
  */
-#include "config.h"
+#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,13 +204,13 @@ 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.xvg",  ffWRITE }
+        { efXVG, NULL,  "scdist",  ffWRITE }
     };
 #define NFILE asize(fnm)
 
-    if (!parse_common_args(&argc, argv, PCA_CAN_TIME | PCA_CAN_VIEW | PCA_BE_NICE,
+    if (!parse_common_args(&argc, argv, PCA_CAN_TIME | PCA_CAN_VIEW,
                            NFILE, fnm, asize(pa), pa, asize(desc), desc, 0, NULL, &oenv))
     {
         return 0;
@@ -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 */