diff options
| author | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2006-08-31 13:39:33 +0000 |
|---|---|---|
| committer | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2006-08-31 13:39:33 +0000 |
| commit | 6418e5fed1eb56e6f949c76d7cf4a32fee2228dd (patch) | |
| tree | dfba913c2e1325e43589c6d9874f6420db58c55f /src | |
| parent | 470b5c17f5737404c7555280f1817be6c9ae3daa (diff) | |
rename local variable 'r' to 'local_r' to avoid conflict with gridfn Grid::r
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@1463 f88db872-0e4f-0410-b76b-b9085cfa78c5
Diffstat (limited to 'src')
| -rw-r--r-- | src/driver/spherical_surface.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/driver/spherical_surface.cc b/src/driver/spherical_surface.cc index b6c60ac..96d3bc8 100644 --- a/src/driver/spherical_surface.cc +++ b/src/driver/spherical_surface.cc @@ -243,9 +243,9 @@ const int max_N_phi = /* SphericalSurface:: */ maxnphi; const double local_y = sin_theta * sin_phi; const double local_z = cos_theta; - const double r = ps.radius_in_local_xyz_direction - (gfns::gfn__h, - local_x, local_y, local_z); + const double local_r = ps.radius_in_local_xyz_direction + (gfns::gfn__h, + local_x, local_y, local_z); // SphericalSurface::sf_radius is actually stored as // a 3-D contiguous array, with indices @@ -253,7 +253,7 @@ const int max_N_phi = /* SphericalSurface:: */ maxnphi; // phi // surface (largest stride) const int sub = i_theta + max_N_theta * (i_phi + max_N_phi*sn); - /* SphericalSurface:: */ sf_radius[sub] = r; + /* SphericalSurface:: */ sf_radius[sub] = local_r; } } } |