Merge release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / legacyheaders / hackblock.h

diff --git a/src/gromacs/legacyheaders/hackblock.h b/src/gromacs/legacyheaders/hackblock.h
index 8827987e5440e1f730acc77745d81e50ef68bd66..68c839ab4950b4109f9829681689830ff5fac5ad 100644 (file)
--- a/src/gromacs/legacyheaders/hackblock.h
+++ b/src/gromacs/legacyheaders/hackblock.h
@@ -80,10 +80,10 @@ typedef struct {
   char   ***atomname;
   int    *cgnr;
   /* Bonded interaction setup */
-  gmx_bool      bAlldih;
+  gmx_bool      bKeepAllGeneratedDihedrals;
   int       nrexcl;
-  gmx_bool      HH14;
-  gmx_bool      bRemoveDih;
+  gmx_bool      bGenerateHH14Interactions;
+  gmx_bool      bRemoveDihedralIfWithImproper;
   /* list of bonded interactions to add */
   t_rbondeds rb[ebtsNR];
 } t_restp;