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

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

diff --git a/include/mdrun.h b/include/mdrun.h
index 6703169339683ee204b6167be43639e06b8e0b4e..81080968bae7bdf6798dcfe09150d7ecf1963866 100644 (file)
--- a/include/mdrun.h
+++ b/include/mdrun.h
@@ -52,7 +52,7 @@
 #include "update.h"
 
 
-#ifdef GMX_THREADS
+#ifdef GMX_THREAD_MPI
 #include "thread_mpi/threads.h"
 #endif
 
@@ -145,7 +145,7 @@ typedef struct {
  */
 extern gmx_large_int_t     deform_init_init_step_tpx;
 extern matrix              deform_init_box_tpx;
-#ifdef GMX_THREADS
+#ifdef GMX_THREAD_MPI
 extern tMPI_Thread_mutex_t deform_init_box_mutex;
 
 /* The minimum number of atoms per thread. With fewer atoms than this,
@@ -169,6 +169,7 @@ typedef double gmx_integrator_t(FILE *log,t_commrec *cr,
                                gmx_edsam_t ed, 
                                t_forcerec *fr,
                                int repl_ex_nst,int repl_ex_seed,
+                                gmx_membed_t membed,
                                real cpt_period,real max_hours,
                                const char *deviceOptions,
                                unsigned long Flags,