Merge release-2018 into master

[alexxy/gromacs.git] / src / gromacs / taskassignment / resourcedivision.cpp

diff --git a/src/gromacs/taskassignment/resourcedivision.cpp b/src/gromacs/taskassignment/resourcedivision.cpp
index 9a980cbf6a89f521cbb12025145ec245b313708e..309d054f494f14e57332fe0316a116f0af366f73 100644 (file)
--- a/src/gromacs/taskassignment/resourcedivision.cpp
+++ b/src/gromacs/taskassignment/resourcedivision.cpp
@@ -651,9 +651,10 @@ static void print_hw_opt(FILE *fp, const gmx_hw_opt_t *hw_opt)
             hw_opt->userGpuTaskAssignment.c_str());
 }
 
-void check_and_update_hw_opt_1(gmx_hw_opt_t    *hw_opt,
-                               const t_commrec *cr,
-                               int              nPmeRanks)
+void check_and_update_hw_opt_1(const gmx::MDLogger &mdlog,
+                               gmx_hw_opt_t        *hw_opt,
+                               const t_commrec     *cr,
+                               int                  nPmeRanks)
 {
     /* Currently hw_opt only contains default settings or settings supplied
      * by the user on the command line.
@@ -666,7 +667,7 @@ void check_and_update_hw_opt_1(gmx_hw_opt_t    *hw_opt,
     /* Check for OpenMP settings stored in environment variables, which can
      * potentially be different on different MPI ranks.
      */
-    gmx_omp_nthreads_read_env(&hw_opt->nthreads_omp, SIMMASTER(cr));
+    gmx_omp_nthreads_read_env(mdlog, &hw_opt->nthreads_omp);
 
     /* Check restrictions on the user supplied options before modifying them.
      * TODO: Put the user values in a const struct and preserve them.