[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 3rd argument of velo_from_element and velo_from_element_d, which was set to the caps_per_proc loop variable (3c1d785)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:09:17 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 3c1d7859b82b75a9cfb57373856a3c5913e2b64c
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Thu Sep 18 10:56:33 2014 -0700
Eliminated the 3rd argument of velo_from_element and velo_from_element_d, which was set to the caps_per_proc loop variable
>---------------------------------------------------------------
3c1d7859b82b75a9cfb57373856a3c5913e2b64c
lib/Advection_diffusion.c | 4 ++--
lib/Full_tracer_advection.c | 2 +-
lib/Global_operations.c | 2 +-
lib/Nodal_mesh.c | 8 ++++----
lib/Process_buoyancy.c | 2 +-
lib/Regional_tracer_advection.c | 2 +-
lib/Topo_gravity.c | 6 +++---
lib/Viscosity_structures.c | 2 +-
lib/prototypes.h | 4 ++--
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/Advection_diffusion.c b/lib/Advection_diffusion.c
index f97eb2b..cd43fa2 100644
--- a/lib/Advection_diffusion.c
+++ b/lib/Advection_diffusion.c
@@ -157,7 +157,7 @@ void std_timestep(struct All_variables *E)
adv_timestep = 1.0e8;
for(el=1;el<=nel;el++) {
- velo_from_element(E,VV,CPPR,el,sphere_key);
+ velo_from_element(E,VV,el,sphere_key);
uc=uc1=uc2=uc3=0.0;
for(i=1;i<=ENODES3D;i++) {
@@ -375,7 +375,7 @@ static void pg_solver(struct All_variables *E,
for(el=1;el<=E->lmesh.nel;el++) {
- velo_from_element(E,VV,CPPR,el,sphere_key);
+ velo_from_element(E,VV,el,sphere_key);
get_rtf_at_vpts(E, CPPR, lev, el, rtf);
diff --git a/lib/Full_tracer_advection.c b/lib/Full_tracer_advection.c
index 446e02a..bc9b9df 100644
--- a/lib/Full_tracer_advection.c
+++ b/lib/Full_tracer_advection.c
@@ -1047,7 +1047,7 @@ void full_get_velocity(struct All_variables *E,
iwedge=shape[0];
/* get cartesian velocity */
- velo_from_element_d(E, VV, CPPR, nelem, sphere_key);
+ velo_from_element_d(E, VV, nelem, sphere_key);
/* depending on wedge, set up velocity points */
diff --git a/lib/Global_operations.c b/lib/Global_operations.c
index 8112d30..10f050b 100644
--- a/lib/Global_operations.c
+++ b/lib/Global_operations.c
@@ -905,7 +905,7 @@ void remove_rigid_rot(struct All_variables *E)
sin_f = sin(f);cos_f = cos(f);
/* get Cartesian, element local velocities */
- velo_from_element_d(E,VV,CPPR,e,sphere_key);
+ velo_from_element_d(E,VV,e,sphere_key);
for (j=1;j<=ppts;j++) {
vx[j] = 0.0;vy[j] = 0.0;
}
diff --git a/lib/Nodal_mesh.c b/lib/Nodal_mesh.c
index 3fc25cf..ccdccfa 100644
--- a/lib/Nodal_mesh.c
+++ b/lib/Nodal_mesh.c
@@ -108,10 +108,10 @@ void v_from_vector_pseudo_surf(E)
}
/* cartesian velocities within element, single prec version */
-void velo_from_element(E,VV,m,el,sphere_key)
+void velo_from_element(E,VV,el,sphere_key)
struct All_variables *E;
float VV[4][9];
- int el,m,sphere_key;
+ int el,sphere_key;
{
int a, node;
@@ -148,10 +148,10 @@ void velo_from_element(E,VV,m,el,sphere_key)
}
/* double prec version */
-void velo_from_element_d(E,VV,m,el,sphere_key)
+void velo_from_element_d(E,VV,el,sphere_key)
struct All_variables *E;
double VV[4][9];
- int el,m,sphere_key;
+ int el,sphere_key;
{
int a, node;
diff --git a/lib/Process_buoyancy.c b/lib/Process_buoyancy.c
index 587d633..cdf634e 100644
--- a/lib/Process_buoyancy.c
+++ b/lib/Process_buoyancy.c
@@ -82,7 +82,7 @@ void heat_flux(E)
for(e=1;e<=E->lmesh.nel;e++) {
- velo_from_element(E,VV,CPPR,e,sphere_key);
+ velo_from_element(E,VV,e,sphere_key);
for(i=1;i<=vpts;i++) {
u[i] = 0.0;
diff --git a/lib/Regional_tracer_advection.c b/lib/Regional_tracer_advection.c
index 1aa259d..c5ea9d1 100644
--- a/lib/Regional_tracer_advection.c
+++ b/lib/Regional_tracer_advection.c
@@ -470,7 +470,7 @@ void regional_get_velocity(struct All_variables *E,
/* get cartesian velocity */
- velo_from_element_d(E, VV, CPPR, nelem, sphere_key);
+ velo_from_element_d(E, VV, nelem, sphere_key);
/* Interpolate the velocity on the tracer position */
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index dadc048..2a7551d 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -207,7 +207,7 @@ void compute_nodal_stress(struct All_variables *E,
vor = 0.0;
get_rtf_at_vpts(E, CPPR, lev, e, rtf);// gets r,theta,phi coordinates at the integration points
- velo_from_element(E,VV,CPPR,e,sphere_key); /* assign node-global
+ velo_from_element(E,VV,e,sphere_key); /* assign node-global
velocities to nodes
local to the
element */
@@ -969,7 +969,7 @@ void get_CBF_topo(E,H,HB) /* call this only for top and bottom processors*
el = E->surf_element[CPPR][els];
elb = el - elz+1;
- velo_from_element(E,VV,CPPR,elb,sphere_key);
+ velo_from_element(E,VV,elb,sphere_key);
for(m=0;m<ends;m++) {
eub [m*dims ] = VV[1][m+1];
@@ -977,7 +977,7 @@ void get_CBF_topo(E,H,HB) /* call this only for top and bottom processors*
eub [m*dims+2] = VV[3][m+1];
}
- velo_from_element(E,VV,CPPR,el,sphere_key);
+ velo_from_element(E,VV,el,sphere_key);
for(m=0;m<ends;m++) {
eu [m*dims ] = VV[1][m+1];
diff --git a/lib/Viscosity_structures.c b/lib/Viscosity_structures.c
index 13af60d..8e16d35 100644
--- a/lib/Viscosity_structures.c
+++ b/lib/Viscosity_structures.c
@@ -1133,7 +1133,7 @@ void strain_rate_2_inv(E,m,EEDOT,SQRT)
get_rtf_at_ppts(E, CPPR, lev, e, rtf); /* pressure evaluation
points */
- velo_from_element(E, VV, CPPR, e, sphere_key);
+ velo_from_element(E, VV, e, sphere_key);
GNx = &(E->gNX[CPPR][e]);
theta = rtf[1][1];
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 1350a1c..f6d6eb8 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -267,8 +267,8 @@ void compute_seismic_model(struct All_variables *, double *, double *, double *)
void v_from_vector(struct All_variables *);
void assign_v_to_vector(struct All_variables *);
void v_from_vector_pseudo_surf(struct All_variables *);
-void velo_from_element(struct All_variables *, float [4][9], int, int, int);
-void velo_from_element_d(struct All_variables *, double [4][9], int, int, int);
+void velo_from_element(struct All_variables *, float [4][9], int, int);
+void velo_from_element_d(struct All_variables *, double [4][9], int, int);
void p_to_nodes(struct All_variables *, double **, float **, int);
More information about the CIG-COMMITS
mailing list