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

[cig_noreply at geodynamics.org]

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

On branch  : rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/b8ceede151860da20e44adbb561266c5d0878b18...0aff4ed493594ce0d58153a5e0b72afdba61d6fd

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

commit 492be9d9c2ce59eb0f55da1a5be177fc587b044f
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 09:14:12 2014 -0700

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


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

492be9d9c2ce59eb0f55da1a5be177fc587b044f
 lib/Regional_tracer_advection.c | 4 ++--
 lib/Tracer_setup.c              | 4 ++--
 lib/prototypes.h                | 2 +-
 lib/tracer_defs.h               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Regional_tracer_advection.c b/lib/Regional_tracer_advection.c
index fa99e7e..1c7446b 100644
--- a/lib/Regional_tracer_advection.c
+++ b/lib/Regional_tracer_advection.c
@@ -455,7 +455,7 @@ double regional_interpolate_data(struct All_variables *E,
 /******** GET VELOCITY ***************************************/
 
 void regional_get_velocity(struct All_variables *E,
-                           int m, int nelem,
+                           int nelem,
                            double theta, double phi, double rad,
                            double *velocity_vector)
 {
@@ -470,7 +470,7 @@ void regional_get_velocity(struct All_variables *E,
 
 
     /* get cartesian velocity */
-    velo_from_element_d(E, VV, m, nelem, sphere_key);
+    velo_from_element_d(E, VV, CPPR, nelem, sphere_key);
 
 
     /* Interpolate the velocity on the tracer position */
diff --git a/lib/Tracer_setup.c b/lib/Tracer_setup.c
index 7cc0755..c96fe9a 100644
--- a/lib/Tracer_setup.c
+++ b/lib/Tracer_setup.c
@@ -396,7 +396,7 @@ static void predict_tracers(struct All_variables *E)
             z0=E->trace.basicq[CPPR][5][kk];
 
             nelem=E->trace.ielement[CPPR][kk];
-            (E->trace.get_velocity)(E,CPPR,nelem,theta0,phi0,rad0,velocity_vector);
+            (E->trace.get_velocity)(E,nelem,theta0,phi0,rad0,velocity_vector);
 
             x_pred=x0+velocity_vector[1]*dt;
             y_pred=y0+velocity_vector[2]*dt;
@@ -497,7 +497,7 @@ static void correct_tracers(struct All_variables *E)
 
             nelem=E->trace.ielement[CPPR][kk];
 
-            (E->trace.get_velocity)(E,CPPR,nelem,theta_pred,phi_pred,rad_pred,velocity_vector);
+            (E->trace.get_velocity)(E,nelem,theta_pred,phi_pred,rad_pred,velocity_vector);
 
             Vx_pred=velocity_vector[1];
             Vy_pred=velocity_vector[2];
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 579f0e9..b8b6cad 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -432,7 +432,7 @@ int isearch_neighbors(double *, int, double, int);
 int regional_icheck_cap(struct All_variables *, int, double, double, double, double);
 void regional_get_shape_functions(struct All_variables *, double [9], int, double, double, double);
 double regional_interpolate_data(struct All_variables *, double [9], double [9]);
-void regional_get_velocity(struct All_variables *, int, int, double, double, double, double *);
+void regional_get_velocity(struct All_variables *, int, double, double, double, double *);
 void regional_keep_within_bounds(struct All_variables *, double *, double *, double *, double *, double *, double *);
 void regional_lost_souls(struct All_variables *);
 /* Regional_version_dependent.c */
diff --git a/lib/tracer_defs.h b/lib/tracer_defs.h
index 0cda229..95361e9 100644
--- a/lib/tracer_defs.h
+++ b/lib/tracer_defs.h
@@ -148,7 +148,7 @@ struct TRACE{
     int (* iget_element)(struct All_variables*, int, int,
                          double, double, double, double, double, double);
 
-    void (* get_velocity)(struct All_variables*, int, int,
+    void (* get_velocity)(struct All_variables*, int,
                           double, double, double, double*);
 
     void (* keep_within_bounds)(struct All_variables*,