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

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Nov 5 19:08:44 PST 2014


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

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

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

commit b8ceede151860da20e44adbb561266c5d0878b18
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Sep 17 16:11:36 2014 -0700

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


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

b8ceede151860da20e44adbb561266c5d0878b18
 lib/Full_sphere_related.c    | 14 +++++++-------
 lib/Full_version_dependent.c |  2 +-
 lib/prototypes.h             |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/Full_sphere_related.c b/lib/Full_sphere_related.c
index d0dc5ec..82b8933 100644
--- a/lib/Full_sphere_related.c
+++ b/lib/Full_sphere_related.c
@@ -152,7 +152,7 @@ static int find_intersection(double *x, double *y,
 }
 
 
-void full_coord_of_cap(struct All_variables *E, int m, int icap)
+void full_coord_of_cap(struct All_variables *E, int icap)
 {
   int i, j, k, lev, temp, elx, ely;
   int node, snode, ns, step;
@@ -472,14 +472,14 @@ void full_coord_of_cap(struct All_variables *E, int m, int icap)
 	   
 	   for (i=1; i<=lvnoz; i++) {
 	     /*   theta,fi,and r coordinates   */
-	     E->SX[lev][m][1][node] = theta;
-	     E->SX[lev][m][2][node] = fi;
-	     E->SX[lev][m][3][node] = E->sphere.R[lev][i];
+	     E->SX[lev][CPPR][1][node] = theta;
+	     E->SX[lev][CPPR][2][node] = fi;
+	     E->SX[lev][CPPR][3][node] = E->sphere.R[lev][i];
 	     
 	     /*   x,y,and z oordinates   */
-	     E->X[lev][m][1][node]  = E->sphere.R[lev][i]*sint*cosf;
-	     E->X[lev][m][2][node]  = E->sphere.R[lev][i]*sint*sinf;
-	     E->X[lev][m][3][node]  = E->sphere.R[lev][i]*cost;
+	     E->X[lev][CPPR][1][node]  = E->sphere.R[lev][i]*sint*cosf;
+	     E->X[lev][CPPR][2][node]  = E->sphere.R[lev][i]*sint*sinf;
+	     E->X[lev][CPPR][3][node]  = E->sphere.R[lev][i]*cost;
 	     
 	     node++;
 	   }
diff --git a/lib/Full_version_dependent.c b/lib/Full_version_dependent.c
index b0eb495..325e862 100644
--- a/lib/Full_version_dependent.c
+++ b/lib/Full_version_dependent.c
@@ -164,7 +164,7 @@ void full_node_locations(E)
   free ((void *) RR);
 
    ii = E->sphere.capid[CPPR];
-   full_coord_of_cap(E,CPPR,ii);
+   full_coord_of_cap(E,ii);
 
   if (E->control.verbose) {
       for (lev=E->mesh.levmin;lev<=E->mesh.levmax;lev++)   {
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 0535410..bf81686 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -148,7 +148,7 @@ void full_solver_init(struct All_variables *);
 /* Full_sphere_related.c */
 void spherical_to_uv2(double [2], int, double *, double *, double *, double *);
 void uv_to_spherical(double [2], int, double *, double *, double *, double *);
-void full_coord_of_cap(struct All_variables *, int, int);
+void full_coord_of_cap(struct All_variables *, int);
 /* Full_tracer_advection.c */
 void full_tracer_input(struct All_variables *);
 void full_tracer_setup(struct All_variables *);



More information about the CIG-COMMITS mailing list