Remove support for implicit solvation

[alexxy/gromacs.git] / src / gromacs / topology / idef.h

diff --git a/src/gromacs/topology/idef.h b/src/gromacs/topology/idef.h
index 467d7d45f8ad189bf717a5661e1738314a6d836a..822bbf25fb96af09d61ce348e0aaef41ac91e9f6 100644 (file)
--- a/src/gromacs/topology/idef.h
+++ b/src/gromacs/topology/idef.h
@@ -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,2016, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2016,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.
@@ -87,11 +87,11 @@ enum {
     F_PIDIHS,
     F_TABDIHS,
     F_CMAP,
-    F_GB12,
-    F_GB13,
-    F_GB14,
-    F_GBPOL,
-    F_NPSOLVATION,
+    F_GB12_NOLONGERUSED,
+    F_GB13_NOLONGERUSED,
+    F_GB14_NOLONGERUSED,
+    F_GBPOL_NOLONGERUSED,
+    F_NPSOLVATION_NOLONGERUSED,
     F_LJ14,
     F_COUL14,
     F_LJC14_Q,
@@ -268,9 +268,6 @@ typedef union t_iparams
     struct {
         int  table; real kA; real kB;
     } tab;
-    struct {
-        real sar, st, pi, gbr, bmlt;
-    } gb;
     struct {
         int cmapA, cmapB;
     } cmap;