Merge branch origin/release-2020 into master

[alexxy/gromacs.git] / src / gromacs / pulling / pullutil.cpp

diff --git a/src/gromacs/pulling/pullutil.cpp b/src/gromacs/pulling/pullutil.cpp
index 92dc7ef24ce035306b5ede508f06ab6834ac8613..46a1aa8ead46cc1a385fdbd319514aa8c4be376b 100644 (file)
--- a/src/gromacs/pulling/pullutil.cpp
+++ b/src/gromacs/pulling/pullutil.cpp
@@ -3,7 +3,8 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015,2016,2017,2018,2019,2020, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2016,2017 by the GROMACS development team.
+ * Copyright (c) 2018,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.
@@ -910,7 +911,7 @@ static bool pullGroupObeysPbcRestrictions(const pull_group_work_t& group,
 
 int pullCheckPbcWithinGroups(const pull_t& pull, const rvec* x, const t_pbc& pbc, real pbcMargin)
 {
-    if (pbc.ePBC == epbcNONE)
+    if (pbc.pbcType == PbcType::No)
     {
         return -1;
     }
@@ -952,7 +953,7 @@ bool pullCheckPbcWithinGroup(const pull_t&                  pull,
                              int                            groupNr,
                              real                           pbcMargin)
 {
-    if (pbc.ePBC == epbcNONE)
+    if (pbc.pbcType == PbcType::No)
     {
         return true;
     }