Merge 'release-4-6' into master

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

diff --git a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_c.c b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_c.c
index 42b8b576b4a5752a57a38ac9f9b76bfbd526be1c..37aa05e0502ea0d92e28983dd32c07ffbc76c897 100644 (file)
--- a/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_c.c
+++ b/src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_c.c
@@ -899,7 +899,6 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
             vfitab           = 3*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -909,7 +908,6 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
 
             /* CUBIC SPLINE TABLE DISPERSION */
             vfitab          += 4;
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -918,7 +916,6 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
             fvdw6            = c6_00*FF;
 
             /* CUBIC SPLINE TABLE REPULSION */
-            Y                = vftab[vfitab+4];
             F                = vftab[vfitab+5];
             Geps             = vfeps*vftab[vfitab+6];
             Heps2            = vfeps*vfeps*vftab[vfitab+7];
@@ -955,7 +952,6 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
             vfitab           = 3*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -991,7 +987,6 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
             vfitab           = 3*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1027,7 +1022,6 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
             vfitab           = 3*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1063,7 +1057,6 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
             vfitab           = 3*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1099,7 +1092,6 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
             vfitab           = 3*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1135,7 +1127,6 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
             vfitab           = 3*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1171,7 +1162,6 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
             vfitab           = 3*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];
@@ -1207,7 +1197,6 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
             vfitab           = 3*4*vfitab;
 
             /* CUBIC SPLINE TABLE ELECTROSTATICS */
-            Y                = vftab[vfitab];
             F                = vftab[vfitab+1];
             Geps             = vfeps*vftab[vfitab+2];
             Heps2            = vfeps*vfeps*vftab[vfitab+3];