[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 6th argument of get_global_1d_shape_fn and get_global_1d_shape_fn_L, which was set to the caps_per_proc loop variable (20dc0c5)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:10:02 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 20dc0c568e95d58e1c495a0833d1b9ffeafdbe41
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Thu Sep 18 12:59:25 2014 -0700
Eliminated the 6th argument of get_global_1d_shape_fn and get_global_1d_shape_fn_L, which was set to the caps_per_proc loop variable
>---------------------------------------------------------------
20dc0c568e95d58e1c495a0833d1b9ffeafdbe41
lib/Advection_diffusion.c | 4 ++--
lib/Determine_net_rotation.c | 2 +-
lib/Global_operations.c | 4 ++--
lib/Size_does_matter.c | 8 ++++----
lib/Topo_gravity.c | 4 ++--
lib/prototypes.h | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/lib/Advection_diffusion.c b/lib/Advection_diffusion.c
index 9f447fa..d71b9ff 100644
--- a/lib/Advection_diffusion.c
+++ b/lib/Advection_diffusion.c
@@ -609,11 +609,11 @@ static void element_residual(struct All_variables *E, int el,
aid = -1;
if (FLAGS[CPPR][E->ien[CPPR][el].node[1]] & FBZ) { // only check for the 1st node
aid = 0;
- get_global_1d_shape_fn(E,el,&GM,&dGamma,aid,CPPR);
+ get_global_1d_shape_fn(E,el,&GM,&dGamma,aid);
}
else if (FLAGS[CPPR][E->ien[CPPR][el].node[5]] & FBZ) { // only check for the 5th node
aid = 1;
- get_global_1d_shape_fn(E,el,&GM,&dGamma,aid,CPPR);
+ get_global_1d_shape_fn(E,el,&GM,&dGamma,aid);
}
if (aid>=0) {
for(a=1;a<=onedvpts;a++) {
diff --git a/lib/Determine_net_rotation.c b/lib/Determine_net_rotation.c
index dca18de..bb37b5b 100644
--- a/lib/Determine_net_rotation.c
+++ b/lib/Determine_net_rotation.c
@@ -96,7 +96,7 @@ double determine_model_net_rotation(struct All_variables *E,double *omega)
for (k=1;k <= ely;k++)
for (j=1;j <= elx;j++) {
el = i + (j-1)*elz + (k-1)*elx*elz;
- get_global_1d_shape_fn(E,el,&M,&dGamma,top,CPPR);
+ get_global_1d_shape_fn(E,el,&M,&dGamma,top);
/* find mean element location and horizontal velocity */
diff --git a/lib/Global_operations.c b/lib/Global_operations.c
index 10f050b..9373632 100644
--- a/lib/Global_operations.c
+++ b/lib/Global_operations.c
@@ -112,7 +112,7 @@ void return_horiz_ave(E,X,H)
for (k=1;k<=ely;k++)
for (j=1;j<=elx;j++) {
el = i + (j-1)*elz + (k-1)*elx*elz;
- get_global_1d_shape_fn(E,el,&M,&dGamma,top,CPPR);
+ get_global_1d_shape_fn(E,el,&M,&dGamma,top);
lnode[1] = E->ien[CPPR][el].node[1];
lnode[2] = E->ien[CPPR][el].node[2];
@@ -189,7 +189,7 @@ void return_horiz_ave_f(E,X,H)
for (k=1;k<=ely;k++)
for (j=1;j<=elx;j++) {
el = i + (j-1)*elz + (k-1)*elx*elz;
- get_global_1d_shape_fn(E,el,&M,&dGamma,top,CPPR);
+ get_global_1d_shape_fn(E,el,&M,&dGamma,top);
lnode[1] = E->ien[CPPR][el].node[1];
lnode[2] = E->ien[CPPR][el].node[2];
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index 10fe9b6..ddced64 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -379,9 +379,9 @@ void construct_bdry_det(struct All_variables *E)
/* ======================================================================
====================================================================== */
-void get_global_1d_shape_fn(E,el,GM,dGammax,top,m)
+void get_global_1d_shape_fn(E,el,GM,dGammax,top)
struct All_variables *E;
- int el,top,m;
+ int el,top;
struct Shape_function1 *GM;
struct Shape_function1_dA *dGammax;
{
@@ -416,9 +416,9 @@ void get_global_1d_shape_fn(E,el,GM,dGammax,top,m)
/* ======================================================================
====================================================================== */
-void get_global_1d_shape_fn_L(E,el,GM,dGammax,top,m)
+void get_global_1d_shape_fn_L(E,el,GM,dGammax,top)
struct All_variables *E;
- int el,top,m;
+ int el,top;
struct Shape_function1 *GM;
struct Shape_function1_dA *dGammax;
{
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 2a7551d..2d88d38 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -1057,8 +1057,8 @@ void get_CBF_topo(E,H,HB) /* call this only for top and bottom processors*
el = E->surf_element[j][els];
elb = el - elz+1;
- get_global_1d_shape_fn_L(E,el,&GM,&dGammax,1,CPPR);
- get_global_1d_shape_fn_L(E,elb,&GMb,&dGammabx,0,CPPR);
+ get_global_1d_shape_fn_L(E,el,&GM,&dGammax,1);
+ get_global_1d_shape_fn_L(E,elb,&GMb,&dGammabx,0);
for(m=1;m<=onedv;m++) {
eltTU[m-1] = 0.0;
diff --git a/lib/prototypes.h b/lib/prototypes.h
index 551ce79..f15c3a8 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -450,8 +450,8 @@ void get_rtf_at_ppts(struct All_variables *, int, int, int, double [4][9]);
void get_side_x_cart(struct All_variables *, double [4][5], int, int, int);
void construct_surf_det(struct All_variables *);
void construct_bdry_det(struct All_variables *);
-void get_global_1d_shape_fn(struct All_variables *, int, struct Shape_function1 *, struct Shape_function1_dA *, int, int);
-void get_global_1d_shape_fn_L(struct All_variables *, int, struct Shape_function1 *, struct Shape_function1_dA *, int, int);
+void get_global_1d_shape_fn(struct All_variables *, int, struct Shape_function1 *, struct Shape_function1_dA *, int);
+void get_global_1d_shape_fn_L(struct All_variables *, int, struct Shape_function1 *, struct Shape_function1_dA *, int);
void get_global_side_1d_shape_fn(struct All_variables *, int, struct Shape_function1 *, struct Shape_function1_dx *, struct Shape_function_side_dA *, int, int);
void construct_c3x3matrix_el(struct All_variables *, int, struct CC *, struct CCX *, int, int);
void construct_side_c3x3matrix_el(struct All_variables *, int, struct CC *, struct CCX *, int, int, int);
More information about the CIG-COMMITS
mailing list