[cig-commits] [commit] rajesh-petsc-schur: Eliminated the 6th argument of construct_c3x3matrix_el, which was set to the caps_per_proc loop variable (3c65af5)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:08:29 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 3c65af5798e0dc91f3b920f22b53bda5063ae461
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 17 15:33:45 2014 -0700
Eliminated the 6th argument of construct_c3x3matrix_el, which was set to the caps_per_proc loop variable
>---------------------------------------------------------------
3c65af5798e0dc91f3b920f22b53bda5063ae461
lib/Anisotropic_viscosity.c | 2 +-
lib/Element_calculations.c | 10 +++++-----
lib/Size_does_matter.c | 2 +-
lib/Topo_gravity.c | 2 +-
lib/Viscosity_structures.c | 2 +-
lib/prototypes.h | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/Anisotropic_viscosity.c b/lib/Anisotropic_viscosity.c
index 25fe351..19e1359 100644
--- a/lib/Anisotropic_viscosity.c
+++ b/lib/Anisotropic_viscosity.c
@@ -826,7 +826,7 @@ void align_director_with_ISA_for_element(struct All_variables *E,
(E->mat[CPPR][e] == -E->viscosity.anivisc_layer))){
get_rtf_at_ppts(E, m, lev, e, rtf); /* pressure points */
//if((e-1)%E->lmesh.elz==0)
- construct_c3x3matrix_el(E,e,&E->element_Cc,&E->element_Ccx,lev,CPPR,1);
+ construct_c3x3matrix_el(E,e,&E->element_Cc,&E->element_Ccx,lev,1);
for(i = 1; i <= ends; i++){ /* velocity at element nodes */
off = E->ien[CPPR][e].node[i];
VV[1][i] = E->sphere.cap[CPPR].V[1][off];
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 0039ebe..92dd97e 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -40,7 +40,7 @@ void construct_side_c3x3matrix_el(struct All_variables *,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 ,int );
+ struct CCX *,int ,int );
void assemble_div_u(struct All_variables *,
double **, double **, int );
static void get_elt_tr(struct All_variables *, int , int , double [24], int );
@@ -300,7 +300,7 @@ void get_elt_k(E,el,elt_k,lev,m,iconv)
get_rtf_at_vpts(E, CPPR, lev, el, rtf);
if (iconv || (el-1)%E->lmesh.ELZ[lev]==0)
- construct_c3x3matrix_el(E,el,&E->element_Cc,&E->element_Ccx,lev,CPPR,0);
+ construct_c3x3matrix_el(E,el,&E->element_Cc,&E->element_Ccx,lev,0);
/* Note N[a].gauss_pt[n] is the value of shape fn a at the nth gaussian
quadrature point. Nx[d] is the derivative wrt x[d]. */
@@ -808,7 +808,7 @@ void get_elt_c(struct All_variables *E, int el,
const int ends = enodes[dims];
if ((el-1)%E->lmesh.ELZ[lev]==0)
- construct_c3x3matrix_el(E,el,&E->element_Cc,&E->element_Ccx,lev,m,1);
+ construct_c3x3matrix_el(E,el,&E->element_Cc,&E->element_Ccx,lev,1);
temp = p_point[1].weight[dims-1] * E->GDA[lev][CPPR][el].ppt[1];
@@ -891,7 +891,7 @@ void get_elt_g(E,el,elt_del,lev,m)
/* Special case, 4/8 node bilinear cartesian square/cube element -> 1 pressure point */
if ((el-1)%E->lmesh.ELZ[lev]==0)
- construct_c3x3matrix_el(E,el,&E->element_Cc,&E->element_Ccx,lev,m,1);
+ construct_c3x3matrix_el(E,el,&E->element_Cc,&E->element_Ccx,lev,1);
get_rtf_at_ppts(E, m, lev, el, rtf);
@@ -988,7 +988,7 @@ void get_elt_f(E,el,elt_f,bcs,m)
es = (el-1)/E->lmesh.elz + 1;
if ((el-1)%E->lmesh.elz==0)
- construct_c3x3matrix_el(E,el,&E->element_Cc,&E->element_Ccx,E->mesh.levmax,m,0);
+ construct_c3x3matrix_el(E,el,&E->element_Cc,&E->element_Ccx,E->mesh.levmax,0);
for(p=0;p<n;p++) elt_f[p] = 0.0;
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index 870d3b0..799b834 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -523,7 +523,7 @@ void get_global_side_1d_shape_fn(E,el,GM,GMx,dGamma,side,m)
/* ==================================================== */
void construct_c3x3matrix_el (struct All_variables *E,int el,struct CC *cc,
- struct CCX *ccx,int lev,int m,int pressure)
+ struct CCX *ccx,int lev,int pressure)
{
int a,i,j,k,d,lnode;
double cofactor(),myatan();
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 768931f..99b9a71 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -243,7 +243,7 @@ void compute_nodal_stress(struct All_variables *E,
*/
if ((e-1)%E->lmesh.elz==0) {
- construct_c3x3matrix_el(E,e,&E->element_Cc,&E->element_Ccx,lev,CPPR,0);
+ construct_c3x3matrix_el(E,e,&E->element_Cc,&E->element_Ccx,lev,0);
}
/* get B at velocity Gauss points */
get_ba(&(E->N), GNx, &E->element_Cc, &E->element_Ccx,rtf, dims, ba);
diff --git a/lib/Viscosity_structures.c b/lib/Viscosity_structures.c
index f24b81a..13af60d 100644
--- a/lib/Viscosity_structures.c
+++ b/lib/Viscosity_structures.c
@@ -1168,7 +1168,7 @@ void strain_rate_2_inv(E,m,EEDOT,SQRT)
*/
if ((e-1)%E->lmesh.elz==0) {
- construct_c3x3matrix_el(E,e,&E->element_Cc,&E->element_Ccx,lev,CPPR,1);
+ construct_c3x3matrix_el(E,e,&E->element_Cc,&E->element_Ccx,lev,1);
}
get_ba_p(&(E->N), GNx, &E->element_Cc, &E->element_Ccx,
diff --git a/lib/prototypes.h b/lib/prototypes.h
index c8a12b4..eb2cc23 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -453,7 +453,7 @@ 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_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, 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_c3x3matrix(struct All_variables *);
void mass_matrix(struct All_variables *);
More information about the CIG-COMMITS
mailing list