Replace gmx_large_int_t with gmx_int64_t

[alexxy/gromacs.git] / src / programs / gmx / tpbconv.c

diff --git a/src/programs/gmx/tpbconv.c b/src/programs/gmx/tpbconv.c
index 21600282e14dedd16101c2f935be9ba698b7a064..880efc205454135426a2b64124009a7666d58310 100644 (file)
--- a/src/programs/gmx/tpbconv.c
+++ b/src/programs/gmx/tpbconv.c
@@ -353,7 +353,7 @@ int gmx_tpbconv(int argc, char *argv[])
     ener_file_t       fp_ener = NULL;
     t_trnheader       head;
     int               i;
-    gmx_large_int_t   nsteps_req, run_step, frame;
+    gmx_int64_t       nsteps_req, run_step, frame;
     double            run_t, state_t;
     gmx_bool          bOK, bNsteps, bExtend, bUntil, bTime, bTraj;
     gmx_bool          bFrame, bUse, bSel, bNeedEner, bReadEner, bScanEner, bFepState;
@@ -413,7 +413,7 @@ int gmx_tpbconv(int argc, char *argv[])
         return 0;
     }
 
-    /* Convert int to gmx_large_int_t */
+    /* Convert int to gmx_int64_t */
     nsteps_req = nsteps_req_int;
     bNsteps    = opt2parg_bSet("-nsteps", asize(pa), pa);
     bExtend    = opt2parg_bSet("-extend", asize(pa), pa);
@@ -556,7 +556,7 @@ int gmx_tpbconv(int argc, char *argv[])
                 if (bFrame || !bOK)
                 {
                     sprintf(buf, "\r%s %s frame %s%s: step %s%s time %s",
-                            "%s", "%s", "%6", gmx_large_int_fmt, "%6", gmx_large_int_fmt, " %8.3f");
+                            "%s", "%s", "%6", GMX_PRId64, "%6", GMX_PRId64, " %8.3f");
                     fprintf(stderr, buf,
                             bUse ? "Read   " : "Skipped", ftp2ext(fn2ftp(frame_fn)),
                             frame, head.step, head.t);
@@ -616,7 +616,7 @@ int gmx_tpbconv(int argc, char *argv[])
         /* Determine total number of steps remaining */
         if (bExtend)
         {
-            ir->nsteps = ir->nsteps - (run_step - ir->init_step) + (gmx_large_int_t)(extend_t/ir->delta_t + 0.5);
+            ir->nsteps = ir->nsteps - (run_step - ir->init_step) + (gmx_int64_t)(extend_t/ir->delta_t + 0.5);
             printf("Extending remaining runtime of by %g ps (now %s steps)\n",
                    extend_t, gmx_step_str(ir->nsteps, buf));
         }
@@ -626,7 +626,7 @@ int gmx_tpbconv(int argc, char *argv[])
                    gmx_step_str(ir->nsteps, buf),
                    gmx_step_str(run_step, buf2),
                    run_t, until_t);
-            ir->nsteps = (gmx_large_int_t)((until_t - run_t)/ir->delta_t + 0.5);
+            ir->nsteps = (gmx_int64_t)((until_t - run_t)/ir->delta_t + 0.5);
             printf("Extending remaining runtime until %g ps (now %s steps)\n",
                    until_t, gmx_step_str(ir->nsteps, buf));
         }
@@ -680,7 +680,7 @@ int gmx_tpbconv(int argc, char *argv[])
         }
 
         state_t = ir->init_t + ir->init_step*ir->delta_t;
-        sprintf(buf,   "Writing statusfile with starting step %s%s and length %s%s steps...\n", "%10", gmx_large_int_fmt, "%10", gmx_large_int_fmt);
+        sprintf(buf,   "Writing statusfile with starting step %s%s and length %s%s steps...\n", "%10", GMX_PRId64, "%10", GMX_PRId64);
         fprintf(stderr, buf, ir->init_step, ir->nsteps);
         fprintf(stderr, "                                 time %10.3f and length %10.3f ps\n",
                 state_t, ir->nsteps*ir->delta_t);