Merge 'release-4-6' into master

[alexxy/gromacs.git] / src / gromacs / gmxlib / nonbonded / nb_kernel_c / nb_kernel_ElecCSTab_VdwBham_GeomW3W3_c.c

diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3W3_c.c
index 3eda3ba3c7f1152c1e962619dee59c1e690c2b1a..bedb2daef98d446bdf2087e616526aa03ac45681 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3W3_c.c
@@ -888,7 +888,6 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3W3_F_c
             vfitab           = 1*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -931,7 +930,6 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3W3_F_c
             vfitab           = 1*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -967,7 +965,6 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3W3_F_c
             vfitab           = 1*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1003,7 +1000,6 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3W3_F_c
             vfitab           = 1*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1039,7 +1035,6 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3W3_F_c
             vfitab           = 1*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1075,7 +1070,6 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3W3_F_c
             vfitab           = 1*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1111,7 +1105,6 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3W3_F_c
             vfitab           = 1*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1147,7 +1140,6 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3W3_F_c
             vfitab           = 1*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1183,7 +1175,6 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3W3_F_c
             vfitab           = 1*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];