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

[alexxy/gromacs.git] / include / disre.h

diff --git a/include/disre.h b/include/disre.h
index 9b7b6df11fe0acb20e379c1a48f965bf75535339..e0e917f4dee9440922b8fb466c7ec4e5d03659dc 100644 (file)
--- a/include/disre.h
+++ b/include/disre.h
@@ -49,12 +49,14 @@ extern "C" {
 
 GMX_LIBGMX_EXPORT
 void init_disres(FILE *fplog,const gmx_mtop_t *mtop,
-                       t_inputrec *ir,const t_commrec *cr,gmx_bool bPartDecomp,
-                       t_fcdata *fcd,t_state *state);
+                 t_inputrec *ir,const t_commrec *cr,gmx_bool bPartDecomp,
+                 t_fcdata *fcd,t_state *state, gmx_bool bIsREMD);
 /* Initiate *fcd data, must be called once, nbonds is the number 
  * of iatoms in the ilist of the idef struct.
  * When time averaging is used, the history is initialized in state,
  * unless it was read before from a checkpoint file.
+ * The implementation of distance restraints with -multi
+ * must differ according to whether REMD is active.
  */
 
 GMX_LIBGMX_EXPORT