Rename trnio routines

[alexxy/gromacs.git] / src / gromacs / fileio / mdoutf.cpp

diff --git a/src/gromacs/fileio/mdoutf.cpp b/src/gromacs/fileio/mdoutf.cpp
index db89c8ea6a45f38b1c99db5d8f85edbb07c9cf56..2f6f68ac37e7dfd6bbbc28080f82ab8acf18ed2c 100644 (file)
--- a/src/gromacs/fileio/mdoutf.cpp
+++ b/src/gromacs/fileio/mdoutf.cpp
@@ -40,7 +40,7 @@
 #include "gromacs/fileio/gmxfio.h"
 #include "gromacs/fileio/tngio.h"
 #include "gromacs/fileio/trajectory_writing.h"
-#include "gromacs/fileio/trnio.h"
+#include "gromacs/fileio/trrio.h"
 #include "gromacs/fileio/xtcio.h"
 #include "gromacs/fileio/xvgr.h"
 #include "gromacs/legacyheaders/checkpoint.h"
@@ -125,7 +125,7 @@ gmx_mdoutf_t init_mdoutf(FILE *fplog, int nfile, const t_filenm fnm[],
             {
                 case efTRR:
                 case efTRN:
-                    of->fp_trn = open_trn(filename, filemode);
+                    of->fp_trn = gmx_trr_open(filename, filemode);
                     break;
                 case efTNG:
                     gmx_tng_open(filename, filemode[0], &of->tng);
@@ -315,11 +315,11 @@ void mdoutf_write_to_trajectory_files(FILE *fplog, t_commrec *cr,
         {
             if (of->fp_trn)
             {
-                fwrite_trn(of->fp_trn, step, t, state_local->lambda[efptFEP],
-                           state_local->box, top_global->natoms,
-                           (mdof_flags & MDOF_X) ? state_global->x : NULL,
-                           (mdof_flags & MDOF_V) ? global_v : NULL,
-                           (mdof_flags & MDOF_F) ? f_global : NULL);
+                gmx_trr_write_frame(of->fp_trn, step, t, state_local->lambda[efptFEP],
+                                    state_local->box, top_global->natoms,
+                                    (mdof_flags & MDOF_X) ? state_global->x : NULL,
+                                    (mdof_flags & MDOF_V) ? global_v : NULL,
+                                    (mdof_flags & MDOF_F) ? f_global : NULL);
                 if (gmx_fio_flush(of->fp_trn) != 0)
                 {
                     gmx_file("Cannot write trajectory; maybe you are out of disk space?");
@@ -405,7 +405,7 @@ void done_mdoutf(gmx_mdoutf_t of)
     }
     if (of->fp_trn)
     {
-        close_trn(of->fp_trn);
+        gmx_trr_close(of->fp_trn);
     }
     if (of->fp_dhdl != NULL)
     {