Clang-tidy: enable further tests

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / vsite_parm.cpp

diff --git a/src/gromacs/gmxpreprocess/vsite_parm.cpp b/src/gromacs/gmxpreprocess/vsite_parm.cpp
index 1b9ea7770a401f6383b43b0ab989c5b179f3ff11..f10501ab0634b005f71d32ee355026d5720ff9a7 100644 (file)
--- a/src/gromacs/gmxpreprocess/vsite_parm.cpp
+++ b/src/gromacs/gmxpreprocess/vsite_parm.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015,2017, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2017,2018, 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.
@@ -1083,7 +1083,6 @@ static void clean_vsite_bonds(t_params *plist, t_pindex pindex[],
                     }
                     oatom = ps->param[i].a[1-k]; /* the other atom */
                     if (vsite_type[oatom] == NOTSET &&
-                        vsite_type[oatom] != F_VSITEN &&
                         oatom == plist[pindex[atom].ftype].param[pindex[atom].parnr].aj())
                     {
                         /* if the other atom isn't a vsite, and it is AI */
@@ -1181,7 +1180,7 @@ static void clean_vsite_bonds(t_params *plist, t_pindex pindex[],
             for (k = 0; (k < 2) && !bKeep; k++) /* for all atoms in the bond */
             {
                 atom = ps->param[i].a[k];
-                if (vsite_type[atom] == NOTSET && vsite_type[atom] != F_VSITEN)
+                if (vsite_type[atom] == NOTSET)
                 {
                     bUsed = FALSE;
                     for (m = 0; (m < vsnral) && !bUsed; m++)
@@ -1372,7 +1371,7 @@ static void clean_vsite_angles(t_params *plist, t_pindex pindex[],
         for (k = 0; (k < 3) && !bKeep; k++) /* for all atoms in the angle */
         {
             atom = ps->param[i].a[k];
-            if (vsite_type[atom] == NOTSET && vsite_type[atom] != F_VSITEN)
+            if (vsite_type[atom] == NOTSET)
             {
                 bUsed = FALSE;
                 for (m = 0; (m < vsnral) && !bUsed; m++)
@@ -1517,7 +1516,7 @@ static void clean_vsite_dihs(t_params *plist, t_pindex pindex[],
             GMX_ASSERT(vsnral != 0, "If we've seen a vsite before, we know how many constructing atoms it had");
             GMX_ASSERT(first_atoms != NULL, "If we've seen a vsite before, we know what its first atom index was");
             atom = ps->param[i].a[k];
-            if (vsite_type[atom] == NOTSET && vsite_type[atom] != F_VSITEN)
+            if (vsite_type[atom] == NOTSET)
             {
                 /* vsnral will be set here, we don't get here with nvsite==0 */
                 bUsed = FALSE;