[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 1st argument of calc_cbase_at_node, which was set to the caps_per_proc loop variable (9e0d6df)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Sep 17 16:13:12 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/1bfd8478d42e61b89bc8cfc1679ae9dcc94936f5...b8ceede151860da20e44adbb561266c5d0878b18
>---------------------------------------------------------------
commit 9e0d6dfa68be3929c7ba26643e54cc1d57ee6e1c
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 17 15:24:40 2014 -0700
Eliminated the 1st argument of calc_cbase_at_node, which was set to the caps_per_proc loop variable
>---------------------------------------------------------------
9e0d6dfa68be3929c7ba26643e54cc1d57ee6e1c
lib/Global_operations.c | 2 +-
lib/Output_gzdir.c | 4 ++--
lib/Pan_problem_misc_functions.c | 4 ++--
lib/prototypes.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/Global_operations.c b/lib/Global_operations.c
index b747d86..8112d30 100644
--- a/lib/Global_operations.c
+++ b/lib/Global_operations.c
@@ -959,7 +959,7 @@ void remove_rigid_rot(struct All_variables *E)
vx[1] = fxyz[3]* E->x[CPPR][1][node] - fxyz[1]*E->x[CPPR][3][node];
vx[2] = fxyz[1]* E->x[CPPR][2][node] - fxyz[2]*E->x[CPPR][1][node];
/* project into theta, phi */
- calc_cbase_at_node(CPPR,node,cart_base,E);
+ calc_cbase_at_node(node,cart_base,E);
v_theta = vx[0]*cart_base[3] + vx[1]*cart_base[4] + vx[2]*cart_base[5] ;
v_phi = vx[0]*cart_base[6] + vx[1]*cart_base[7];
E->sphere.cap[CPPR].V[1][node] -= v_theta;
diff --git a/lib/Output_gzdir.c b/lib/Output_gzdir.c
index ba3f772..d2e0ace 100644
--- a/lib/Output_gzdir.c
+++ b/lib/Output_gzdir.c
@@ -80,7 +80,7 @@ int be_is_little_endian(void);
int be_write_float_to_file(float *, int , FILE *);
int be_write_int_to_file(int *, int , FILE *);
void myfprintf(FILE *,char *);
-void calc_cbase_at_node(int , int , float *,struct All_variables *);
+void calc_cbase_at_node(int , float *,struct All_variables *);
/* */
void get_vtk_filename(char *,int,struct All_variables *,int);
@@ -464,7 +464,7 @@ void gzdir_output_velo_temp(struct All_variables *E, int cycles)
/* compute */
for(i=1,k=0;i <= E->lmesh.nno;i++,k += 9){
/* cartesian basis vectors at theta, phi */
- calc_cbase_at_node(CPPR,i,(E->output.gzdir.vtk_base+k),E);
+ calc_cbase_at_node(i,(E->output.gzdir.vtk_base+k),E);
}
E->output.gzdir.vtk_base_init = 1;
}
diff --git a/lib/Pan_problem_misc_functions.c b/lib/Pan_problem_misc_functions.c
index ca9cb62..12ba811 100644
--- a/lib/Pan_problem_misc_functions.c
+++ b/lib/Pan_problem_misc_functions.c
@@ -63,7 +63,7 @@ void xyz2rtp(float ,float ,float ,float *);
void xyz2rtpd(float ,float ,float ,double *);
void get_r_spacing_fine(double *,struct All_variables *);
void get_r_spacing_at_levels(double *,struct All_variables *);
-void calc_cbase_at_node(int , int , float *,struct All_variables *);
+void calc_cbase_at_node(int , float *,struct All_variables *);
#ifdef ALLOW_ELLIPTICAL
double theta_g(double , struct All_variables *);
#endif
@@ -443,7 +443,7 @@ void calc_cbase_at_tp_d(double theta, double phi, double *base) /* double versio
/* calculate base at nodal locations where we have precomputed cos/sin */
-void calc_cbase_at_node(int cap, int node, float *base,struct All_variables *E)
+void calc_cbase_at_node(int node, float *base,struct All_variables *E)
{
int lev ;
double ct,cp,st,sp;
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 49f518c..c8a12b4 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -348,7 +348,7 @@ void xyz2rtp(float, float, float, float *);
void xyz2rtpd(float, float, float, double *);
void calc_cbase_at_tp(float, float, float *);
void calc_cbase_at_tp_d(double, double, double *);
-void calc_cbase_at_node(int, int, float *, struct All_variables *);
+void calc_cbase_at_node(int, float *, struct All_variables *);
void convert_pvec_to_cvec(float, float, float, float *, float *);
void convert_pvec_to_cvec_d(double, double, double, double *, double *);
void *safe_malloc(size_t);
More information about the CIG-COMMITS
mailing list