Renamed local variable 'index' to 'vindex' to get rid of gcc compiler warnings

about naming variables after global functions.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusWave/IDScalarWaveCXX/trunk@40 7ec00dc9-1e7a-42ad-bf73-a299ee168e72

1 files changed, 44 insertions, 50 deletions

diff --git a/src/InitialData.cc b/src/InitialData.cc
index d5c6682..57c4aab 100644
--- a/src/InitialData.cc
+++ b/src/InitialData.cc
@@ -1,16 +1,17 @@
  /*@@
-   @file      InitialData.cc
-   @date      
-   @author    Werner Benger   
-   @desc 
-              Initial data for the 3D Wave Equation
-	      Derived from Tom Goodale
-   @enddesc 
+   @file     InitialData.cc
+   @date
+   @author   Werner Benger
+   @desc
+             Initial data for the 3D Wave Equation
+             Derived from Tom Goodale
+   @enddesc
+   @version  $Id$
  @@*/
 
 #include <math.h>
 
-#include "cctk.h" 
+#include "cctk.h"
 #include "cctk_Parameters.h"
 #include "cctk_Arguments.h"
 
@@ -27,20 +28,17 @@ inline CCTK_REAL sqr(CCTK_REAL val)
 
  /*@@
    @routine    IDScalarWave_InitialData
-   @date       
+   @date
    @author     Tom Goodale
-   @desc 
+   @desc
                Set up initial data for the wave equation
-   @enddesc 
-   @calls      
-   @calledby   
-   @history 
+   @enddesc
+   @history
    @hdate Mon Oct 11 11:48:03 1999 @hauthor Werner Benger
    @hdesc  Converted to C++
    @hdate Mon Oct 11 11:48:20 1999 @hauthor Tom Goodale
    @hdesc Added the rest of the initial data.
-   @endhistory 
-
+   @endhistory
 @@*/
 
 extern "C" void IDScalarWaveCXX_InitialData(CCTK_ARGUMENTS)
@@ -59,14 +57,13 @@ extern "C" void IDScalarWaveCXX_InitialData(CCTK_ARGUMENTS)
       for(int j=0; j<cctk_lsh[1]; j++)
       {
         for(int i=0; i<cctk_lsh[0]; i++)
-        { 
-
-          int index =  CCTK_GFINDEX3D(cctkGH,i,j,k);
+        {
+          int vindex =  CCTK_GFINDEX3D(cctkGH,i,j,k);
 
-          phi[index]     = amplitude*cos(kx*x[index]+ky*y[index]+kz*z[index]+omega*cctk_time);
-          phi_p[index] = amplitude*cos(kx*x[index]+ky*y[index]+kz*z[index]+omega*(cctk_time-dt));
+          phi[vindex]     = amplitude*cos(kx*x[vindex]+ky*y[vindex]+kz*z[vindex]+omega*cctk_time);
+          phi_p[vindex] = amplitude*cos(kx*x[vindex]+ky*y[vindex]+kz*z[vindex]+omega*(cctk_time-dt));
         }
-      } 
+      }
     }
   }
   else if(CCTK_Equals(initial_data, "gaussian"))
@@ -77,24 +74,24 @@ extern "C" void IDScalarWaveCXX_InitialData(CCTK_ARGUMENTS)
       {
         for(int i=0; i<cctk_lsh[0]; i++)
         {
-          int index =  CCTK_GFINDEX3D(cctkGH,i,j,k);
+          int vindex =  CCTK_GFINDEX3D(cctkGH,i,j,k);
 
-          CCTK_REAL X = x[index], Y = y[index], Z = z[index];
+          CCTK_REAL X = x[vindex], Y = y[vindex], Z = z[vindex];
           CCTK_REAL R = sqrt(X*X + Y*Y + Z*Z);
 
-          phi[index] = amplitude*exp( - sqr( (R - radius) / sigma ) );
- 	  if (R == 0.0) 
-	  {
-	    phi_p[index] = amplitude*(1.0 - 2.0*dt*dt/sigma)*exp(-dt*dt/sigma);
-	  }
-	  else
-	  {
-	    phi_p[index] = amplitude/2.0*(R-dt)/R*
-	      exp( - sqr( (R - radius - dt)/ sigma ) )
-	      + amplitude/2.0*(R+dt)/R*
-	      exp( - sqr( (R - radius + dt)/ sigma ) );
-	  }
-        } 
+          phi[vindex] = amplitude*exp( - sqr( (R - radius) / sigma ) );
+           if (R == 0.0)
+          {
+            phi_p[vindex] = amplitude*(1.0 - 2.0*dt*dt/sigma)*exp(-dt*dt/sigma);
+          }
+          else
+          {
+            phi_p[vindex] = amplitude/2.0*(R-dt)/R*
+              exp( - sqr( (R - radius - dt)/ sigma ) )
+              + amplitude/2.0*(R+dt)/R*
+              exp( - sqr( (R - radius + dt)/ sigma ) );
+          }
+        }
       }
     }
   }
@@ -109,16 +106,16 @@ extern "C" void IDScalarWaveCXX_InitialData(CCTK_ARGUMENTS)
       {
         for(int i=0; i<cctk_lsh[0]; i++)
         {
-          int index =  CCTK_GFINDEX3D(cctkGH,i,j,k);
+          int vindex =  CCTK_GFINDEX3D(cctkGH,i,j,k);
 
-          phi[index] = amplitude*sin(kx*(x[index]-0.5)*pi)*
-                                 sin(ky*(y[index]-0.5)*pi)*
-                                 sin(kz*(z[index]-0.5)*pi)*
+          phi[vindex] = amplitude*sin(kx*(x[vindex]-0.5)*pi)*
+                                 sin(ky*(y[vindex]-0.5)*pi)*
+                                 sin(kz*(z[vindex]-0.5)*pi)*
                                  cos(omega*cctk_time*pi);
 
-          phi_p[index] = amplitude*sin(kx*(x[index]-0.5)*pi)*
-                                       sin(ky*(y[index]-0.5)*pi)*
-                                       sin(kz*(z[index]-0.5)*pi)*
+          phi_p[vindex] = amplitude*sin(kx*(x[vindex]-0.5)*pi)*
+                                       sin(ky*(y[vindex]-0.5)*pi)*
+                                       sin(kz*(z[vindex]-0.5)*pi)*
                                        cos(omega*(cctk_time-dt)*pi);
         }
       }
@@ -132,16 +129,13 @@ extern "C" void IDScalarWaveCXX_InitialData(CCTK_ARGUMENTS)
       {
         for(int i=0; i<cctk_lsh[0]; i++)
         {
-          int index =  CCTK_GFINDEX3D(cctkGH,i,j,k);
+          int vindex =  CCTK_GFINDEX3D(cctkGH,i,j,k);
 
-          phi[index] = 0.0;
+          phi[vindex] = 0.0;
 
-          phi_p[index] = 0.0;
+          phi_p[vindex] = 0.0;
         }
       }
     }
   }
-
-  return;
 }
-