Rename some variables in GPU task assignment and fix their usage

[alexxy/gromacs.git] / src / gromacs / hardware / hw_info.h

diff --git a/src/gromacs/hardware/hw_info.h b/src/gromacs/hardware/hw_info.h
index 4d51d955adef28c88cd822041b06d4bd1e1183e1..044c8dd86b47e28eabe4ae4bb9b1cc09f38078b3 100644 (file)
--- a/src/gromacs/hardware/hw_info.h
+++ b/src/gromacs/hardware/hw_info.h
@@ -2,7 +2,7 @@
  * This file is part of the GROMACS molecular simulation package.
  *
  * Copyright (c) 2012,2013,2014,2015,2016 by the GROMACS development team.
- * Copyright (c) 2017,2019,2020, by the GROMACS development team, led by
+ * Copyright (c) 2017,2019,2020,2021, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -134,9 +134,9 @@ struct gmx_hw_opt_t
     //! Logical core pinning offset.
     int core_pinning_offset = 0;
     //! Empty, or a string provided by the user declaring (unique) GPU IDs available for mdrun to use.
-    std::string gpuIdsAvailable = "";
+    std::string devicesSelectedByUser;
     //! Empty, or a string provided by the user mapping GPU tasks to devices.
-    std::string userGpuTaskAssignment = "";
+    std::string userGpuTaskAssignment;
     //! Tells whether mdrun is free to choose the total number of threads (by choosing the number of OpenMP and/or thread-MPI threads).
     bool totNumThreadsIsAuto;
 };