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

[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 d90e80234e53db6d447466ce33245259bfdd8fb5
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 09:22:55 2014 -0700

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


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

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

diff --git a/lib/Full_tracer_advection.c b/lib/Full_tracer_advection.c
index 85ad92b..322f66b 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -2518,7 +2518,7 @@ static void fix_theta_phi(double *theta, double *phi)
 /* it is not known, input a negative number.                     */
 
 int full_iget_element(struct All_variables *E,
-                      int j, int iprevious_element,
+                      int iprevious_element,
                       double x, double y, double z,
                       double theta, double phi, double rad)
 {
@@ -2675,17 +2675,6 @@ int full_iget_element(struct All_variables *E,
 
     iel=icheck_all_columns(E,CPPR,x,y,z,rad);
 
-    /*
-      fprintf(E->trace.fpt,"WARNING(full_iget_element)-doing a full search!\n");
-      fprintf(E->trace.fpt,"  Most often means tracers have moved more than 1 element away\n");
-      fprintf(E->trace.fpt,"  or regular element resolution is way too low.\n");
-      fprintf(E->trace.fpt,"  COLUMN: %d \n",iel);
-      fprintf(E->trace.fpt,"  PREVIOUS ELEMENT: %d \n",iprevious_element);
-      fprintf(E->trace.fpt,"  x,y,z,theta,phi,rad: %f %f %f   %f %f %f\n",x,y,z,theta,phi,rad);
-      fflush(E->trace.fpt);
-      if (E->trace.itracer_warnings) exit(10);
-    */
-
     if (E->trace.istat1%100==0)
         {
             fprintf(E->trace.fpt,"Checked all elements %d times already this turn\n",E->trace.istat1);
diff --git a/lib/prototypes.h b/lib/prototypes.h
index b8b6cad..acfa0ac 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -157,7 +157,7 @@ void full_get_shape_functions(struct All_variables *, double [9], int, double, d
 double full_interpolate_data(struct All_variables *, double [9], double [9]);
 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);
+int full_iget_element(struct All_variables *, int, double, double, double, double, double, double);
 void full_keep_within_bounds(struct All_variables *, double *, double *, double *, double *, double *, double *);
 void analytical_test(struct All_variables *);
 void analytical_runge_kutte(struct All_variables *, int, double, double *, double *, double *, double *, double *);