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

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / grompp.c

diff --git a/src/gromacs/gmxpreprocess/grompp.c b/src/gromacs/gmxpreprocess/grompp.c
index 98d9315e3e5b7b9c765c1783fc628ede9d7b8674..7e32feb2f6d1e0ee545ce072a2e499068ee3fbfd 100644 (file)
--- a/src/gromacs/gmxpreprocess/grompp.c
+++ b/src/gromacs/gmxpreprocess/grompp.c
@@ -34,9 +34,9 @@
  * 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 "grompp.h"
+#include "gmxpre.h"
 
-#include "config.h"
+#include "grompp.h"
 
 #include <sys/types.h>
 #include <math.h>
@@ -45,35 +45,35 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "macros.h"
+#include "gromacs/legacyheaders/macros.h"
 #include "readir.h"
 #include "toputil.h"
 #include "topio.h"
 #include "gromacs/fileio/confio.h"
 #include "readir.h"
-#include "names.h"
+#include "gromacs/legacyheaders/names.h"
 #include "grompp-impl.h"
 #include "gromacs/gmxpreprocess/gen_maxwell_velocities.h"
 #include "gromacs/math/vec.h"
 #include "gromacs/utility/futil.h"
-#include "splitter.h"
+#include "gromacs/legacyheaders/splitter.h"
 #include "gromacs/gmxpreprocess/sortwater.h"
 #include "convparm.h"
-#include "warninp.h"
+#include "gromacs/legacyheaders/warninp.h"
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/trnio.h"
 #include "gromacs/fileio/tpxio.h"
 #include "gromacs/fileio/trxio.h"
 #include "vsite_parm.h"
-#include "txtdump.h"
-#include "calcgrid.h"
+#include "gromacs/legacyheaders/txtdump.h"
+#include "gromacs/legacyheaders/calcgrid.h"
 #include "add_par.h"
 #include "gromacs/fileio/enxio.h"
-#include "perf_est.h"
+#include "gromacs/legacyheaders/perf_est.h"
 #include "compute_io.h"
 #include "gpp_atomtype.h"
 #include "gromacs/topology/mtop_util.h"
-#include "genborn.h"
+#include "gromacs/legacyheaders/genborn.h"
 #include "calc_verletbuf.h"
 #include "tomorse.h"
 #include "gromacs/imd/imd.h"
@@ -1534,7 +1534,7 @@ int gmx_grompp(int argc, char *argv[])
         { efNDX, NULL,  NULL,        ffOPTRD },
         { efTOP, NULL,  NULL,        ffREAD  },
         { efTOP, "-pp", "processed", ffOPTWR },
-        { efTPX, "-o",  NULL,        ffWRITE },
+        { efTPR, "-o",  NULL,        ffWRITE },
         { efTRN, "-t",  NULL,        ffOPTRD },
         { efEDR, "-e",  NULL,        ffOPTRD },
         /* This group is needed by the VMD viewer as the start configuration for IMD sessions: */
@@ -2083,7 +2083,7 @@ int gmx_grompp(int argc, char *argv[])
     }
 
     done_warning(wi, FARGS);
-    write_tpx_state(ftp2fn(efTPX, NFILE, fnm), ir, &state, sys);
+    write_tpx_state(ftp2fn(efTPR, NFILE, fnm), ir, &state, sys);
 
     /* Output IMD group, if bIMD is TRUE */
     write_IMDgroup_to_file(ir->bIMD, ir, &state, sys, NFILE, fnm);