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

[alexxy/gromacs.git] / src / programs / mdrun / runner.c

diff --git a/src/programs/mdrun/runner.c b/src/programs/mdrun/runner.c
index ad22f7194eed216326ae0bcff151167c7116d007..f5b862d0cf17ed7b805663b6d1a75edf1a735a5c 100644 (file)
--- a/src/programs/mdrun/runner.c
+++ b/src/programs/mdrun/runner.c
@@ -76,6 +76,8 @@
 #include "membed.h"
 #include "macros.h"
 
+#include "gmx_omp.h"
+
 #ifdef GMX_LIB_MPI
 #include <mpi.h>
 #endif
@@ -91,10 +93,6 @@
 #include "md_openmm.h"
 #endif
 
-#ifdef GMX_OPENMP
-#include <omp.h>
-#endif
-
 
 typedef struct { 
     gmx_integrator_t *func;
@@ -832,7 +830,7 @@ int mdrunner(int nthreads_requested, FILE *fplog,t_commrec *cr,int nfile,
             {
                 cpu_set_t mask;
                 CPU_ZERO(&mask);
-                core+=omp_get_thread_num();
+                core+=gmx_omp_get_thread_num();
                 CPU_SET(core,&mask);
                 sched_setaffinity((pid_t) syscall (SYS_gettid),sizeof(cpu_set_t),&mask);
             }