[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 2nd argument of full_get_velocity, which was set to the caps_per_proc loop variable (fe37242)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/citcoms

On branch  : rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

>---------------------------------------------------------------

commit fe37242fe9a9fbf14923e1083d2feb5dcf17da59
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 09:07:29 2014 -0700

    Eliminated the 2nd argument of full_get_velocity, which was set to the caps_per_proc loop variable


>---------------------------------------------------------------

fe37242fe9a9fbf14923e1083d2feb5dcf17da59
 lib/Full_tracer_advection.c | 25 +------------------------
 lib/prototypes.h            |  2 +-
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/lib/Full_tracer_advection.c b/lib/Full_tracer_advection.c
index 98926d2..85ad92b 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -1030,7 +1030,7 @@ double full_interpolate_data(struct All_variables *E,
 /*         6        7               6            8                           */
 
 void full_get_velocity(struct All_variables *E,
-                       int j, int nelem,
+                       int nelem,
                        double theta, double phi, double rad,
                        double *velocity_vector)
 {
@@ -1100,10 +1100,6 @@ void full_get_velocity(struct All_variables *E,
         vy[4]*shape[4]+vy[5]*shape[5]+shape[6]*vy[6];
     velocity_vector[3]=vz[1]*shape[1]+vz[2]*shape[2]+shape[3]*vz[3]+
         vz[4]*shape[4]+vz[5]*shape[5]+shape[6]*vz[6];
-
-
-
-    return;
 }
 
 /***************************************************************/
@@ -1147,13 +1143,6 @@ static void get_2dshape(struct All_variables *E,
     a2=E->trace.shape_coefs[CPPR][iwedge][9][n];
 
     shape2d[3]=a0+a1*u+a2*v;
-
-    /** debug **
-    fprintf(E->trace.fpt, "el=%d els=%d iwedge=%d shape=(%e %e %e)\n",
-            nelem, n, iwedge, shape2d[1], shape2d[2], shape2d[3]);
-    /**/
-
-    return;
 }
 
 /***************************************************************/
@@ -1205,14 +1194,9 @@ static void get_radial_shape(struct All_variables *E,
             fflush(E->trace.fpt);
             exit(10);
         }
-
-    return;
 }
 
 
-
-
-
 /**************************************************************/
 /* SPHERICAL TO UV                                               */
 /*                                                            */
@@ -1249,13 +1233,6 @@ static void spherical_to_uv(struct All_variables *E, int j,
 
     *u=sint*sinp2*cosc;
     *v=(sin_theta_f*cost-cos_theta_f*sint*cosp2)*cosc;
-
-    /** debug **
-    fprintf(E->trace.fpt, "(%e %e) -> (%e %e)\n",
-            theta, phi, *u, *v);
-    /**/
-
-    return;
 }
 
 
diff --git a/lib/prototypes.h b/lib/prototypes.h
index bf81686..579f0e9 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -155,7 +155,7 @@ void full_tracer_setup(struct All_variables *);
 void full_lost_souls(struct All_variables *);
 void full_get_shape_functions(struct All_variables *, double [9], int, double, double, double);
 double full_interpolate_data(struct All_variables *, double [9], double [9]);
-void full_get_velocity(struct All_variables *, int, int, double, double, double, double *);
+void full_get_velocity(struct All_variables *, int, double, double, double, double *);
 int full_icheck_cap(struct All_variables *, int, double, double, double, double);
 int full_iget_element(struct All_variables *, int, int, double, double, double, double, double, double);
 void full_keep_within_bounds(struct All_variables *, double *, double *, double *, double *, double *, double *);