Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / ns.c

diff --git a/src/gromacs/mdlib/ns.c b/src/gromacs/mdlib/ns.c
index 209534910a516b5c7680df44eafa81cbaa09d41a..417b596c1cb47d705edf4b4fb17b547b1a5658a8 100644 (file)
--- a/src/gromacs/mdlib/ns.c
+++ b/src/gromacs/mdlib/ns.c
@@ -1280,14 +1280,14 @@ put_in_list_adress(gmx_bool              bHaveVdW[],
                      * processed by the generic AdResS kernel.
                      */
                     if ( (bEnergyGroupCG &&
-                         wf[i_atom] >= 1-GMX_REAL_EPS && wf[jj] >= 1-GMX_REAL_EPS ) ||
-                           ( !bEnergyGroupCG && wf[jj] <= GMX_REAL_EPS ) )
+                          wf[i_atom] >= 1-GMX_REAL_EPS && wf[jj] >= 1-GMX_REAL_EPS ) ||
+                         ( !bEnergyGroupCG && wf[jj] <= GMX_REAL_EPS ) )
                     {
                         continue;
                     }
 
                     b_hybrid = !((wf[i_atom] >= 1-GMX_REAL_EPS && wf[jj] >= 1-GMX_REAL_EPS) ||
-                        (wf[i_atom] <= GMX_REAL_EPS && wf[jj] <= GMX_REAL_EPS));
+                                 (wf[i_atom] <= GMX_REAL_EPS && wf[jj] <= GMX_REAL_EPS));
 
                     if (bNotEx)
                     {