Commit f67975fd authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

apply proper initialization and remove redundant variable declaration

parent deceb9d5
Loading
Loading
Loading
Loading
+9 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ int RegCone::surface_exterior(double *x, double cutoff)

    // radius of curvature, only used for granular walls

    double crad = 0.0; 
    crad = 0.0;

    // x is far enough from cone that there is no contact
    // x is interior to cone
@@ -475,6 +475,10 @@ int RegCone::surface_exterior(double *x, double cutoff)
    r = sqrt(del1*del1 + del2*del2);
    currentradius = radiuslo + (x[1]-lo)*(radiushi-radiuslo)/(hi-lo);

    // radius of curvature, only used for granular walls

    crad = 0.0;

    // y is far enough from cone that there is no contact
    // y is interior to cone

@@ -536,6 +540,10 @@ int RegCone::surface_exterior(double *x, double cutoff)
    r = sqrt(del1*del1 + del2*del2);
    currentradius = radiuslo + (x[2]-lo)*(radiushi-radiuslo)/(hi-lo);

    // radius of curvature, only used for granular walls

    crad = 0.0;

    // z is far enough from cone that there is no contact
    // z is interior to cone