[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 2nd argument of icheck_processor_shell and icheck_that_processor_shell, which was set to the caps_per_proc loop variable (7d038af)

[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 7d038af1f1e12984bbff44810f653f887bb6e7be
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 18 11:33:20 2014 -0700

    Eliminated the 2nd argument of icheck_processor_shell and icheck_that_processor_shell, which was set to the caps_per_proc loop variable


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

7d038af1f1e12984bbff44810f653f887bb6e7be
 lib/Full_tracer_advection.c     |  4 ++--
 lib/Regional_tracer_advection.c |  2 +-
 lib/Tracer_setup.c              | 16 +++++++---------
 lib/prototypes.h                |  4 ++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/Full_tracer_advection.c b/lib/Full_tracer_advection.c
index 98437b1..2442b78 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -552,7 +552,7 @@ void full_lost_souls(struct All_variables *E)
 
                 rad=REC[CPPR][irad];
 
-                ival=icheck_that_processor_shell(E,j,ithat_processor,rad);
+                ival=icheck_that_processor_shell(E,ithat_processor,rad);
 
 
                 /* if tracer is in other shell, take out of receive array and give to send_z*/
@@ -2522,7 +2522,7 @@ int full_iget_element(struct All_variables *E,
     /* check the radial range */
     if (E->parallel.nprocz>1)
         {
-            ival=icheck_processor_shell(E,CPPR,rad);
+            ival=icheck_processor_shell(E,rad);
             if (ival!=1) return -99;
         }
 
diff --git a/lib/Regional_tracer_advection.c b/lib/Regional_tracer_advection.c
index c5ea9d1..d5460bf 100644
--- a/lib/Regional_tracer_advection.c
+++ b/lib/Regional_tracer_advection.c
@@ -800,7 +800,7 @@ static void put_found_tracers(struct All_variables *E,
 
         /* check whether this tracer is inside this proc */
         /* check radius first, since it is cheaper       */
-        inside = icheck_processor_shell(E, CPPR, rad);
+        inside = icheck_processor_shell(E, rad);
         if (inside == 1)
             inside = regional_icheck_cap(E, 0, theta, phi, rad, rad);
         else
diff --git a/lib/Tracer_setup.c b/lib/Tracer_setup.c
index 080b79e..039b5f2 100644
--- a/lib/Tracer_setup.c
+++ b/lib/Tracer_setup.c
@@ -55,7 +55,7 @@ void gzip_file(char *);
 #endif
 
 int icheck_that_processor_shell(struct All_variables *E,
-                                       int j, int nprocessor, double rad);
+                                       int nprocessor, double rad);
 void expand_later_array(struct All_variables *E);
 void expand_tracer_arrays(struct All_variables *E);
 void tracer_post_processing(struct All_variables *E);
@@ -87,8 +87,7 @@ void cart_to_sphere(struct All_variables *,
 void sphere_to_cart(struct All_variables *,
                     double , double , double ,
                     double *, double *, double *);
-int icheck_processor_shell(struct All_variables *,
-                           int , double );
+int icheck_processor_shell(struct All_variables *, double );
 
 
 
@@ -928,7 +927,7 @@ static void read_tracer_file(struct All_variables *E)
             /* check whether tracer is within processor domain */
 
             icheck=1;
-            if (E->parallel.nprocz>1) icheck=icheck_processor_shell(E,CPPR,rad);
+            if (E->parallel.nprocz>1) icheck=icheck_processor_shell(E,rad);
             if (icheck!=1) continue;
 
             if (E->parallel.nprocxy==1)
@@ -1620,8 +1619,7 @@ static void eject_tracer(struct All_variables *E, int it)
 /* and not including the top boundary unless  */
 /* the shell in question is the top shell     */
 
-int icheck_processor_shell(struct All_variables *E,
-                           int j, double rad)
+int icheck_processor_shell(struct All_variables *E, double rad)
 {
 
     const int noz = E->lmesh.noz;
@@ -1663,20 +1661,20 @@ int icheck_processor_shell(struct All_variables *E,
 /* included).                                    */
 
 int icheck_that_processor_shell(struct All_variables *E,
-                                int j, int nprocessor, double rad)
+                                int nprocessor, double rad)
 {
     int icheck_processor_shell();
     int me = E->parallel.me;
 
     /* nprocessor is right on top of me */
     if (nprocessor == me+1) {
-        if (icheck_processor_shell(E, CPPR, rad) == 0) return 1;
+        if (icheck_processor_shell(E, rad) == 0) return 1;
         else return 0;
     }
 
     /* nprocessor is right on bottom of me */
     if (nprocessor == me-1) {
-        if (icheck_processor_shell(E, CPPR, rad) == -99) return 1;
+        if (icheck_processor_shell(E, rad) == -99) return 1;
         else return 0;
     }
 
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 3565c8e..afcfef5 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -513,8 +513,8 @@ void get_neighboring_caps(struct All_variables *);
 void allocate_tracer_arrays(struct All_variables *, int);
 void expand_tracer_arrays(struct All_variables *);
 void expand_later_array(struct All_variables *);
-int icheck_processor_shell(struct All_variables *, int, double);
-int icheck_that_processor_shell(struct All_variables *, int, int, double);
+int icheck_processor_shell(struct All_variables *, double);
+int icheck_that_processor_shell(struct All_variables *, int, double);
 /* Viscosity_structures.c */
 void viscosity_system_input(struct All_variables *);
 void viscosity_input(struct All_variables *);