Merge commit d30f2cb6 from release-2020 into master

[alexxy/gromacs.git] / src / gromacs / modularsimulator / computeglobalselement.cpp

diff --git a/src/gromacs/modularsimulator/computeglobalselement.cpp b/src/gromacs/modularsimulator/computeglobalselement.cpp
index e90277657376776d8dd6d43604735cfde9c90344..bf6935b20c31daa2ad17b8c4aadfb077a0717a0a 100644 (file)
--- a/src/gromacs/modularsimulator/computeglobalselement.cpp
+++ b/src/gromacs/modularsimulator/computeglobalselement.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2019, by the GROMACS development team, led by
+ * Copyright (c) 2019,2020, 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.
@@ -141,7 +141,7 @@ void ComputeGlobalsElement<algorithm>::elementSetup()
         for (int cgloIteration = 0; cgloIteration < (stopCM ? 2 : 1); cgloIteration++)
         {
             unsigned int cglo_flags_iteration = cglo_flags;
-            if (doStopCM_ && cgloIteration == 0)
+            if (stopCM && cgloIteration == 0)
             {
                 cglo_flags_iteration |= CGLO_STOPCM;
                 cglo_flags_iteration &= ~CGLO_TEMPERATURE;