Merge remote-tracking branch 'origin/release-4-6'

[alexxy/gromacs.git] / src / gromacs / mdlib / minimize.c

diff --git a/src/gromacs/mdlib/minimize.c b/src/gromacs/mdlib/minimize.c
index 21c34c6750321d428bc7ba78a15b1e83742987b3..c360264bc1188be56acb59a7a53951fd9b7e62b9 100644 (file)
--- a/src/gromacs/mdlib/minimize.c
+++ b/src/gromacs/mdlib/minimize.c
@@ -75,7 +75,6 @@
 #include "mtop_util.h"
 #include "gmxfio.h"
 #include "pme.h"
-#include "membed.h"
 
 typedef struct {
   t_state s;
@@ -832,7 +831,7 @@ double do_cg(FILE *fplog,t_commrec *cr,
              gmx_edsam_t ed,
              t_forcerec *fr,
              int repl_ex_nst,int repl_ex_seed,
-             gmx_membed_t *membed,
+             gmx_membed_t membed,
              real cpt_period,real max_hours,
              const char *deviceOptions,
              unsigned long Flags,
@@ -1353,7 +1352,7 @@ double do_lbfgs(FILE *fplog,t_commrec *cr,
                 gmx_edsam_t ed,
                 t_forcerec *fr,
                 int repl_ex_nst,int repl_ex_seed,
-                gmx_membed_t *membed,
+                gmx_membed_t membed,
                 real cpt_period,real max_hours,
                 const char *deviceOptions,
                 unsigned long Flags,
@@ -1988,7 +1987,7 @@ double do_steep(FILE *fplog,t_commrec *cr,
                 gmx_edsam_t ed,
                 t_forcerec *fr,
                 int repl_ex_nst,int repl_ex_seed,
-                gmx_membed_t *membed,
+                gmx_membed_t membed,
                 real cpt_period,real max_hours,
                 const char *deviceOptions,
                 unsigned long Flags,
@@ -2193,7 +2192,7 @@ double do_nm(FILE *fplog,t_commrec *cr,
              gmx_edsam_t ed,
              t_forcerec *fr,
              int repl_ex_nst,int repl_ex_seed,
-             gmx_membed_t *membed,
+             gmx_membed_t membed,
              real cpt_period,real max_hours,
              const char *deviceOptions,
              unsigned long Flags,