Merge release-4-6 (commit 'Ic142a690')

[alexxy/gromacs.git] / src / gromacs / gmxlib / typedefs.c

diff --git a/src/gromacs/gmxlib/typedefs.c b/src/gromacs/gmxlib/typedefs.c
index 8825bb495373861a522da03e845db79d9e490662..e610c2617d9fe44f1d97afcad478c8d8d5777c7d 100644 (file)
--- a/src/gromacs/gmxlib/typedefs.c
+++ b/src/gromacs/gmxlib/typedefs.c
@@ -422,7 +422,7 @@ void done_inputrec(t_inputrec *ir)
   }
 }
 
-static void init_ekinstate(ekinstate_t *eks)
+static void zero_ekinstate(ekinstate_t *eks)
 {
   eks->ekin_n         = 0;
   eks->ekinh          = NULL;
@@ -556,7 +556,7 @@ void init_state(t_state *state, int natoms, int ngtc, int nnhpres, int nhchainle
   state->sd_X = NULL;
   state->cg_p = NULL;
 
-  init_ekinstate(&state->ekinstate);
+  zero_ekinstate(&state->ekinstate);
 
   init_energyhistory(&state->enerhist);