Merge release-4-5-patches into release-4-6

[alexxy/gromacs.git] / src / kernel / repl_ex.h

diff --git a/src/kernel/repl_ex.h b/src/kernel/repl_ex.h
index 0d81016461e17b59093fe10e38667b65c1d149ab..7e4bf23d6880c80403af17224a84b322e054e85b 100644 (file)
--- a/src/kernel/repl_ex.h
+++ b/src/kernel/repl_ex.h
@@ -45,13 +45,13 @@ extern gmx_repl_ex_t init_replica_exchange(FILE *fplog,
                                           const gmx_multisim_t *ms,
                                           const t_state *state,
                                           const t_inputrec *ir,
-                                          int nst,int init_seed);
+                                          int nst, int nmultiex, int init_seed);
 /* Should only be called on the master nodes */
 
 extern gmx_bool replica_exchange(FILE *fplog,
                             const t_commrec *cr,
                             gmx_repl_ex_t re,
-                            t_state *state,real *ener,
+                            t_state *state,gmx_enerdata_t *enerd,
                             t_state *state_local,
                             gmx_large_int_t step,real time);
 /* Attempts replica exchange, should be called on all nodes.