[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 2nd argument of regional_iget_element, which was set to the caps_per_proc loop variable (fee6136)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Sep 18 13:17:19 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/b8ceede151860da20e44adbb561266c5d0878b18...0aff4ed493594ce0d58153a5e0b72afdba61d6fd
>---------------------------------------------------------------
commit fee6136bcbf3c26e764b96e355ddc59cecefd187
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Thu Sep 18 09:29:29 2014 -0700
Eliminated the 2nd argument of regional_iget_element, which was set to the caps_per_proc loop variable
>---------------------------------------------------------------
fee6136bcbf3c26e764b96e355ddc59cecefd187
lib/Full_tracer_advection.c | 4 ++--
lib/Regional_tracer_advection.c | 4 ++--
lib/Tracer_setup.c | 2 +-
lib/prototypes.h | 2 +-
lib/tracer_defs.h | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/Full_tracer_advection.c b/lib/Full_tracer_advection.c
index 322f66b..7c5172f 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -737,7 +737,7 @@ void full_lost_souls(struct All_variables *E)
z=E->trace.basicq[CPPR][5][E->trace.ntracers[CPPR]];
- iel=(E->trace.iget_element)(E,j,-99,x,y,z,theta,phi,rad);
+ iel=(E->trace.iget_element)(E,-99,x,y,z,theta,phi,rad);
if (iel<1) {
fprintf(E->trace.fpt,"Error(lost souls) - element not here?\n");
@@ -944,7 +944,7 @@ void full_get_shape_functions(struct All_variables *E,
sphere_to_cart(E,theta,phi,rad,&x,&y,&z);
ival=icheck_element(E,CPPR,nelem,x,y,z,rad);
fprintf(E->trace.fpt,"ICHECK?: %d\n",ival);
- ival=(E->trace.iget_element)(E,CPPR,-99,x,y,z,theta,phi,rad);
+ ival=(E->trace.iget_element)(E,-99,x,y,z,theta,phi,rad);
fprintf(E->trace.fpt,"New Element?: %d\n",ival);
ival=icheck_column_neighbors(E,CPPR,nelem,x,y,z,rad);
fprintf(E->trace.fpt,"New Element (neighs)?: %d\n",ival);
diff --git a/lib/Regional_tracer_advection.c b/lib/Regional_tracer_advection.c
index 1c7446b..1aa259d 100644
--- a/lib/Regional_tracer_advection.c
+++ b/lib/Regional_tracer_advection.c
@@ -254,7 +254,7 @@ static void make_mesh_ijk(struct All_variables *E)
/* it is not known, input a negative number. */
int regional_iget_element(struct All_variables *E,
- int m, int iprevious_element,
+ int iprevious_element,
double dummy1, double dummy2, double dummy3,
double theta, double phi, double rad)
{
@@ -823,7 +823,7 @@ static void put_found_tracers(struct All_variables *E,
/* found the element */
- iel = regional_iget_element(E, CPPR, -99, 0, 0, 0, theta, phi, rad);
+ iel = regional_iget_element(E, -99, 0, 0, 0, theta, phi, rad);
if (iel<1) {
fprintf(E->trace.fpt, "Error(regional lost souls) - "
diff --git a/lib/Tracer_setup.c b/lib/Tracer_setup.c
index c96fe9a..ebf9de1 100644
--- a/lib/Tracer_setup.c
+++ b/lib/Tracer_setup.c
@@ -591,7 +591,7 @@ static void find_tracers(struct All_variables *E)
iprevious_element=E->trace.ielement[CPPR][it];
- iel=(E->trace.iget_element)(E,CPPR,iprevious_element,x,y,z,theta,phi,rad);
+ iel=(E->trace.iget_element)(E,iprevious_element,x,y,z,theta,phi,rad);
E->trace.ielement[CPPR][it]=iel;
diff --git a/lib/prototypes.h b/lib/prototypes.h
index acfa0ac..54ff94a 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -426,7 +426,7 @@ void regional_solver_init(struct All_variables *);
void regional_coord_of_cap(struct All_variables *, int, int);
/* Regional_tracer_advection.c */
void regional_tracer_setup(struct All_variables *);
-int regional_iget_element(struct All_variables *, int, int, double, double, double, double, double, double);
+int regional_iget_element(struct All_variables *, int, double, double, double, double, double, double);
int isearch_all(double *, int, double);
int isearch_neighbors(double *, int, double, int);
int regional_icheck_cap(struct All_variables *, int, double, double, double, double);
diff --git a/lib/tracer_defs.h b/lib/tracer_defs.h
index 95361e9..f0513e6 100644
--- a/lib/tracer_defs.h
+++ b/lib/tracer_defs.h
@@ -145,7 +145,7 @@ struct TRACE{
/* function pointers */
/*********************/
- int (* iget_element)(struct All_variables*, int, int,
+ int (* iget_element)(struct All_variables*, int,
double, double, double, double, double, double);
void (* get_velocity)(struct All_variables*, int,
More information about the CIG-COMMITS
mailing list