[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 6th argument of construct_side_c3x3matrix_el, which was set to the caps_per_proc loop variable (2d167b0)

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


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

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

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

commit 2d167b0ae9f486e2dd347cbf78252f30d8622816
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Sep 17 15:39:20 2014 -0700

    Eliminated the 6th argument of construct_side_c3x3matrix_el, which was set to the caps_per_proc loop variable


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

2d167b0ae9f486e2dd347cbf78252f30d8622816
 lib/Element_calculations.c | 8 +++-----
 lib/Size_does_matter.c     | 2 +-
 lib/prototypes.h           | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 92dd97e..2fbb66c 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -37,7 +37,7 @@
 /* else, PGI would complain */
 void construct_side_c3x3matrix_el(struct All_variables *,int ,
 				  struct CC *,struct CCX *,
-				  int ,int ,int ,int );
+				  int ,int ,int );
 void construct_c3x3matrix(struct All_variables *);
 void construct_c3x3matrix_el (struct All_variables *,int ,struct CC *,
 			      struct CCX *,int ,int );
@@ -1098,8 +1098,7 @@ static void get_elt_tr(struct All_variables *E, int bel, int side, double elt_tr
 	if(!found) return;
 
 	/* compute traction at each int point */
-	construct_side_c3x3matrix_el(E,el,&Cc,&Ccx,
-				     E->mesh.levmax,m,0,side);
+	construct_side_c3x3matrix_el(E,el,&Cc,&Ccx, E->mesh.levmax,0,side);
 
 	for(k=1;k<=oned;k++)
 		for(d=1;d<=dims;d++) {
@@ -1201,8 +1200,7 @@ static void get_elt_tr_pseudo_surf(struct All_variables *E, int bel, int side, d
 	if(!found) return;
 
 	/* compute traction at each int point */
-	construct_side_c3x3matrix_el(E,el,&Cc,&Ccx,
-				     E->mesh.levmax,m,0,side);
+	construct_side_c3x3matrix_el(E,el,&Cc,&Ccx, E->mesh.levmax,0,side);
 
 	for(k=1;k<=oned;k++)
 		for(d=1;d<=dims;d++) {
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index 799b834..10fe9b6 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -663,7 +663,7 @@ void construct_c3x3matrix_el (struct All_variables *E,int el,struct CC *cc,
 
 void construct_side_c3x3matrix_el(struct All_variables *E,int el,
 				  struct CC *cc,struct CCX *ccx,
-				  int lev,int m,int pressure,int side)
+				  int lev,int pressure,int side)
 {
   int a,aa,i,j,k,d,lnode;
   double cofactor(),myatan();
diff --git a/lib/prototypes.h b/lib/prototypes.h
index eb2cc23..6322cef 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -454,7 +454,7 @@ void get_global_1d_shape_fn(struct All_variables *, int, struct Shape_function1
 void get_global_1d_shape_fn_L(struct All_variables *, int, struct Shape_function1 *, struct Shape_function1_dA *, int, 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, int);
+void construct_side_c3x3matrix_el(struct All_variables *, int, struct CC *, struct CCX *, int, int, int);
 void construct_c3x3matrix(struct All_variables *);
 void mass_matrix(struct All_variables *);
 /* Solver_conj_grad.c */



More information about the CIG-COMMITS mailing list