Merge release-4-6 into release-5-0

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / addconf.c

diff --git a/src/gromacs/gmxpreprocess/addconf.c b/src/gromacs/gmxpreprocess/addconf.c
index e2d7a17e619ec75431ee630e49a3932dc65eb00a..27a3b5b752d35180f8391b9a4ccccc75450cd397 100644 (file)
--- a/src/gromacs/gmxpreprocess/addconf.c
+++ b/src/gromacs/gmxpreprocess/addconf.c
@@ -434,6 +434,11 @@ void add_conf(t_atoms *atoms, rvec **x, rvec **v, real **r, gmx_bool bSrenew,
             for (j = j0; (j < j1 && nremove < natoms_solvt); j++)
             {
                 jnr = nlist->jjnr[j];
+                if (jnr < 0)
+                {
+                    /* skip padding */
+                    continue;
+                }
                 copy_rvec(x_all[jnr], xj);
 
                 /* Check solvent-protein and solvent-solvent */