[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->GNX as part of caps_per_proc removal (483d77a)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:12:05 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 483d77a9b9f63dfdcb0ea214feda2d8d017ac03b
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 16:37:42 2014 -0700
Changed the shape of E->GNX as part of caps_per_proc removal
>---------------------------------------------------------------
483d77a9b9f63dfdcb0ea214feda2d8d017ac03b
lib/Element_calculations.c | 12 ++++++------
lib/Instructions.c | 4 ++--
lib/Size_does_matter.c | 4 ++--
lib/global_defs.h | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 829657a..7364518 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -320,7 +320,7 @@ void get_elt_k(E,el,elt_k,lev,iconv)
#endif
}
/* */
- get_ba(&(E->N), &(E->GNX[lev][CPPR][el]), &E->element_Cc, &E->element_Ccx,
+ get_ba(&(E->N), &(E->GNX[lev][el]), &E->element_Cc, &E->element_Ccx,
rtf, E->mesh.nsd, ba);
for(a=1;a<=ends;a++) /* loop over element nodes */
@@ -846,7 +846,7 @@ void get_elt_c(struct All_variables *E, int el, higher_precision elt_c[24][1], i
for(a=1;a<=ends;a++) {
for (i=1;i<=dims;i++) {
- x[i] = rho[a] * E->GNX[lev][CPPR][el].ppt[GNPXINDEX(2,a,1)]
+ x[i] = rho[a] * E->GNX[lev][el].ppt[GNPXINDEX(2,a,1)]
* E->N.ppt[GNPINDEX(a,1)]
* E->element_Cc.ppt[BPINDEX(3,i,a,1)];
}
@@ -914,7 +914,7 @@ void get_elt_g(E,el,elt_del,lev)
for(k=0;k<6;k++)
Duse[j][k] += Dtmp[j][k]*weight;
}
- get_ba_p(&(E->N),&(E->GNX[lev][CPPR][el]),&E->element_Cc, &E->element_Ccx,rtf,E->mesh.nsd,ba);
+ get_ba_p(&(E->N),&(E->GNX[lev][el]),&E->element_Cc, &E->element_Ccx,rtf,E->mesh.nsd,ba);
/* assume single pressure point */
for(a = 1; a <= ends; a++){
@@ -941,13 +941,13 @@ void get_elt_g(E,el,elt_del,lev)
/* old, isotropic part */
for(a=1;a<=ends;a++) {
for (i=1;i<=dims;i++)
- x[i] = E->GNX[lev][CPPR][el].ppt[GNPXINDEX(2,a,1)] * E->element_Cc.ppt[BPINDEX(3,i,a,1)] +
+ x[i] = E->GNX[lev][el].ppt[GNPXINDEX(2,a,1)] * E->element_Cc.ppt[BPINDEX(3,i,a,1)] +
2.0 * ra * E->N.ppt[GNPINDEX(a,1)]*E->element_Cc.ppt[BPINDEX(3,i,a,1)] +
ra *
- (E->GNX[lev][CPPR][el].ppt[GNPXINDEX(0,a,1)]*E->element_Cc.ppt[BPINDEX(1,i,a,1)] +
+ (E->GNX[lev][el].ppt[GNPXINDEX(0,a,1)]*E->element_Cc.ppt[BPINDEX(1,i,a,1)] +
E->N.ppt[GNPINDEX(a,1)]*E->element_Ccx.ppt[BPXINDEX(1,i,1,a,1)] +
ct * E->N.ppt[GNPINDEX(a,1)] * E->element_Cc.ppt[BPINDEX(1,i,a,1)] +
- si * (E->GNX[lev][CPPR][el].ppt[GNPXINDEX(1,a,1)] * E->element_Cc.ppt[BPINDEX(2,i,a,1)] +
+ si * (E->GNX[lev][el].ppt[GNPXINDEX(1,a,1)] * E->element_Cc.ppt[BPINDEX(2,i,a,1)] +
E->N.ppt[GNPINDEX(a,1)] * E->element_Ccx.ppt[BPXINDEX(2,i,2,a,1)]));
p=dims*(a-1);
elt_del[p ][0] = -x[1] * temp;
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 2311305..9c6d79f 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1029,7 +1029,7 @@ void allocate_common_vars(E)
for (k=1;k<=4;k++)
E->sphere.angle1[i][CPPR][k] = (double *) malloc((snel+1)*sizeof(double));
- E->GNX[i][CPPR] = (struct Shape_function_dx *)malloc((nel+1)*sizeof(struct Shape_function_dx));
+ E->GNX[i] = (struct Shape_function_dx *)malloc((nel+1)*sizeof(struct Shape_function_dx));
E->GDA[i][CPPR] = (struct Shape_function_dA *)malloc((nel+1)*sizeof(struct Shape_function_dA));
E->MASS[i] = (double *) malloc((nno+1)*sizeof(double));
@@ -1361,7 +1361,7 @@ void set_up_nonmg_aliases(struct All_variables *E)
E->ccx = E->CCX[E->mesh.levmax][CPPR];
E->Mass = E->MASS[E->mesh.levmax];
E->gDA[CPPR] = E->GDA[E->mesh.levmax][CPPR];
- E->gNX[CPPR] = E->GNX[E->mesh.levmax][CPPR];
+ E->gNX[CPPR] = E->GNX[E->mesh.levmax];
for (i=1;i<=E->mesh.nsd;i++) {
E->x[i] = E->X[E->mesh.levmax][i];
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index e58df9d..6f54d5f 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -119,7 +119,7 @@ static void get_global_shape_fn_sph(struct All_variables *E,
for(j=1;j<=ends;j++)
for(d=1;d<=dims;d++) {
- E->GNX[lev][CPPR][el].vpt[GNVXINDEX(d-1,j,k)]
+ E->GNX[lev][el].vpt[GNVXINDEX(d-1,j,k)]
= bc[d][1]*LGNx.vpt[GNVXINDEX(0,j,k)]
+ bc[d][2]*LGNx.vpt[GNVXINDEX(1,j,k)]
+ bc[d][3]*LGNx.vpt[GNVXINDEX(2,j,k)];
@@ -162,7 +162,7 @@ static void get_global_shape_fn_sph(struct All_variables *E,
}
for(j=1;j<=ends;j++)
for(d=1;d<=dims;d++) {
- E->GNX[lev][CPPR][el].ppt[GNPXINDEX(d-1,j,k)]
+ E->GNX[lev][el].ppt[GNPXINDEX(d-1,j,k)]
= bc[d][1]*LGNx.ppt[GNPXINDEX(0,j,k)]
+ bc[d][2]*LGNx.ppt[GNPXINDEX(1,j,k)]
+ bc[d][3]*LGNx.ppt[GNPXINDEX(2,j,k)];
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 464101e..d92ae0a 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -868,7 +868,7 @@ struct All_variables {
float *age_t;
- struct Shape_function_dx *GNX[MAX_LEVELS][NCS];
+ struct Shape_function_dx *GNX[MAX_LEVELS];
struct Shape_function_dA *GDA[MAX_LEVELS][NCS];
struct Shape_function_dx *gNX[NCS];
struct Shape_function_dA *gDA[NCS];
More information about the CIG-COMMITS
mailing list