Merge release-5-0 into master

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

diff --git a/src/gromacs/gmxpreprocess/topio.c b/src/gromacs/gmxpreprocess/topio.c
index e09518e8b270c2fc12fb6c2f1d9a3aa7bfb138b6..7a3fe0033fdecc1dc69778ace3dfc76bc7daf30b 100644 (file)
--- a/src/gromacs/gmxpreprocess/topio.c
+++ b/src/gromacs/gmxpreprocess/topio.c
@@ -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, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015, 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.
@@ -889,6 +889,10 @@ static char **read_topol(const char *infile, const char *outfile,
                             push_bond(d, plist, mi0->plist, &(mi0->atoms), atype, pline, FALSE,
                                       bGenPairs, *fudgeQQ, bZero, &bWarn_copy_A_B, wi);
                             break;
+                        case d_pairs_nb:
+                            push_bond(d, plist, mi0->plist, &(mi0->atoms), atype, pline, FALSE,
+                                      FALSE, 1.0, bZero, &bWarn_copy_A_B, wi);
+                            break;
 
                         case d_vsites2:
                         case d_vsites3: