Merge branch 'release-2018' into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / nonbonded / nb_generic.cpp

diff --git a/src/gromacs/gmxlib/nonbonded/nb_generic.cpp b/src/gromacs/gmxlib/nonbonded/nb_generic.cpp
index 3dfc7bdf1ffe3b8ca972f0fb36747c3e0c765eda..d95223a1b37005b9f6e7fa7cd36282d2c485c90f 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_generic.cpp
+++ b/src/gromacs/gmxlib/nonbonded/nb_generic.cpp
@@ -301,11 +301,6 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
                         felec            = -qq*FF*tabscale*rinv;
                         break;
 
-                    case GMX_NBKERNEL_ELEC_GENERALIZEDBORN:
-                        /* GB */
-                        gmx_fatal(FARGS, "Death & horror! GB generic interaction not implemented.\n");
-                        break;
-
                     case GMX_NBKERNEL_ELEC_EWALD:
                         ewrt             = rsq*rinv*ewtabscale;
                         ewitab           = ewrt;