Move read_tps_conf() to confio.h

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

diff --git a/src/gromacs/gmxana/gmx_mdmat.c b/src/gromacs/gmxana/gmx_mdmat.c
index 6b24575bcae4ddb88977aed89ea8bb03368a82bc..8d2ac08527ab1a3d5367d54d667db66d3cfcfd83 100644 (file)
--- a/src/gromacs/gmxana/gmx_mdmat.c
+++ b/src/gromacs/gmxana/gmx_mdmat.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -36,27 +36,26 @@
  */
 #include "gmxpre.h"
 
-#include "config.h"
-
 #include <math.h>
 #include <string.h>
 
-#include "gromacs/legacyheaders/macros.h"
-#include "gromacs/math/vec.h"
-#include "gromacs/legacyheaders/typedefs.h"
-#include "gromacs/fileio/filenm.h"
 #include "gromacs/commandline/pargs.h"
-#include "gromacs/utility/futil.h"
-#include "gromacs/utility/fatalerror.h"
-#include "gromacs/utility/smalloc.h"
+#include "gromacs/fileio/confio.h"
+#include "gromacs/fileio/filenm.h"
 #include "gromacs/fileio/matio.h"
-#include "gromacs/fileio/xvgr.h"
-#include "gromacs/topology/index.h"
-#include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trxio.h"
-#include "gromacs/pbcutil/rmpbc.h"
+#include "gromacs/fileio/xvgr.h"
+#include "gromacs/gmxana/gmx_ana.h"
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/legacyheaders/typedefs.h"
+#include "gromacs/math/vec.h"
 #include "gromacs/pbcutil/pbc.h"
-#include "gmx_ana.h"
+#include "gromacs/pbcutil/rmpbc.h"
+#include "gromacs/topology/index.h"
+#include "gromacs/utility/cstringutil.h"
+#include "gromacs/utility/fatalerror.h"
+#include "gromacs/utility/futil.h"
+#include "gromacs/utility/smalloc.h"
 
 
 #define FARAWAY 10000
@@ -396,7 +395,7 @@ int gmx_mdmat(int argc, char *argv[])
             fprintf(fp, "%3d  %8.3f  %3d  %8.3f  %3d  %8.3f\n",
                     i+1, ratio, tot_n[i], mean_n[i], natm[i], mean_n[i]/natm[i]);
         }
-        gmx_ffclose(fp);
+        xvgrclose(fp);
     }
 
     return 0;