[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->X as part of caps_per_proc removal (ea3930c)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:11:56 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit ea3930cc4de475505de8c1a1bf80babcca388ca7
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 15:52:57 2014 -0700
Changed the shape of E->X as part of caps_per_proc removal
>---------------------------------------------------------------
ea3930cc4de475505de8c1a1bf80babcca388ca7
lib/Full_sphere_related.c | 6 +++---
lib/Full_version_dependent.c | 26 +++++++++++++-------------
lib/Instructions.c | 6 +++---
lib/Regional_sphere_related.c | 12 ++++++------
lib/Size_does_matter.c | 26 +++++++++++++-------------
lib/Sphere_util.c | 12 ++++++------
lib/global_defs.h | 2 +-
7 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/lib/Full_sphere_related.c b/lib/Full_sphere_related.c
index 377bb42..bf8e2aa 100644
--- a/lib/Full_sphere_related.c
+++ b/lib/Full_sphere_related.c
@@ -477,9 +477,9 @@ void full_coord_of_cap(struct All_variables *E, int icap)
E->SX[lev][3][node] = E->sphere.R[lev][i];
/* x,y,and z oordinates */
- E->X[lev][CPPR][1][node] = E->sphere.R[lev][i]*sint*cosf;
- E->X[lev][CPPR][2][node] = E->sphere.R[lev][i]*sint*sinf;
- E->X[lev][CPPR][3][node] = E->sphere.R[lev][i]*cost;
+ E->X[lev][1][node] = E->sphere.R[lev][i]*sint*cosf;
+ E->X[lev][2][node] = E->sphere.R[lev][i]*sint*sinf;
+ E->X[lev][3][node] = E->sphere.R[lev][i]*cost;
node++;
}
diff --git a/lib/Full_version_dependent.c b/lib/Full_version_dependent.c
index 27d8347..4b9a48a 100644
--- a/lib/Full_version_dependent.c
+++ b/lib/Full_version_dependent.c
@@ -51,19 +51,19 @@ static void full_rotate_mesh(struct All_variables *E, double dircos[4][4], int i
for (lev=E->mesh.levmin;lev<=E->mesh.levmax;lev++) {
for (i=1;i<=E->lmesh.NNO[lev];i++) {
- t[0] = E->X[lev][CPPR][1][i]*dircos[1][1]+
- E->X[lev][CPPR][2][i]*dircos[1][2]+
- E->X[lev][CPPR][3][i]*dircos[1][3];
- t[1] = E->X[lev][CPPR][1][i]*dircos[2][1]+
- E->X[lev][CPPR][2][i]*dircos[2][2]+
- E->X[lev][CPPR][3][i]*dircos[2][3];
- t[2] = E->X[lev][CPPR][1][i]*dircos[3][1]+
- E->X[lev][CPPR][2][i]*dircos[3][2]+
- E->X[lev][CPPR][3][i]*dircos[3][3];
-
- E->X[lev][CPPR][1][i] = t[0];
- E->X[lev][CPPR][2][i] = t[1];
- E->X[lev][CPPR][3][i] = t[2];
+ t[0] = E->X[lev][1][i]*dircos[1][1]+
+ E->X[lev][2][i]*dircos[1][2]+
+ E->X[lev][3][i]*dircos[1][3];
+ t[1] = E->X[lev][1][i]*dircos[2][1]+
+ E->X[lev][2][i]*dircos[2][2]+
+ E->X[lev][3][i]*dircos[2][3];
+ t[2] = E->X[lev][1][i]*dircos[3][1]+
+ E->X[lev][2][i]*dircos[3][2]+
+ E->X[lev][3][i]*dircos[3][3];
+
+ E->X[lev][1][i] = t[0];
+ E->X[lev][2][i] = t[1];
+ E->X[lev][3][i] = t[2];
E->SX[lev][1][i] = acos(t[2]/E->SX[lev][3][i]);
E->SX[lev][2][i] = myatan(t[1],t[0]);
}
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 3c0be7d..cb7bd76 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1016,7 +1016,7 @@ void allocate_common_vars(E)
snel=E->lmesh.SNEL[i];
for(d=1;d<=E->mesh.nsd;d++) {
- E->X[i][CPPR][d] = (double *) malloc((nno+1)*sizeof(double));
+ E->X[i][d] = (double *) malloc((nno+1)*sizeof(double));
E->SX[i][d] = (double *) malloc((nno+1)*sizeof(double));
}
@@ -1040,7 +1040,7 @@ void allocate_common_vars(E)
for(d=1;d<=E->mesh.nsd;d++)
for(l=1;l<=E->lmesh.NNO[i];l++) {
E->SX[i][d][l] = 0.0;
- E->X[i][CPPR][d][l] = 0.0;
+ E->X[i][d][l] = 0.0;
}
}
@@ -1364,7 +1364,7 @@ void set_up_nonmg_aliases(struct All_variables *E)
E->gNX[CPPR] = E->GNX[E->mesh.levmax][CPPR];
for (i=1;i<=E->mesh.nsd;i++) {
- E->x[i] = E->X[E->mesh.levmax][CPPR][i];
+ E->x[i] = E->X[E->mesh.levmax][i];
E->sx[i] = E->SX[E->mesh.levmax][i];
}
}
diff --git a/lib/Regional_sphere_related.c b/lib/Regional_sphere_related.c
index e9bcfbd..28aca84 100644
--- a/lib/Regional_sphere_related.c
+++ b/lib/Regional_sphere_related.c
@@ -169,11 +169,11 @@ void regional_coord_of_cap(E,icap)
E->SX[lev][3][node] = E->sphere.R[lev][i];
/* x,y,and z oordinates */
- E->X[lev][CPPR][1][node] =
+ E->X[lev][1][node] =
E->sphere.R[lev][i]*sin(theta1[lev][nodesx])*cos(fi1[lev][nodesy]);
- E->X[lev][CPPR][2][node] =
+ E->X[lev][2][node] =
E->sphere.R[lev][i]*sin(theta1[lev][nodesx])*sin(fi1[lev][nodesy]);
- E->X[lev][CPPR][3][node] =
+ E->X[lev][3][node] =
E->sphere.R[lev][i]*cos(theta1[lev][nodesx]);
}
}
@@ -252,11 +252,11 @@ void regional_coord_of_cap(E,icap)
E->SX[lev][3][node] = E->sphere.R[lev][i];
/* x,y,and z oordinates */
- E->X[lev][CPPR][1][node] =
+ E->X[lev][1][node] =
E->sphere.R[lev][i]*sin(SX[0][nodes])*cos(SX[1][nodes]);
- E->X[lev][CPPR][2][node] =
+ E->X[lev][2][node] =
E->sphere.R[lev][i]*sin(SX[0][nodes])*sin(SX[1][nodes]);
- E->X[lev][CPPR][3][node] =
+ E->X[lev][3][node] =
E->sphere.R[lev][i]*cos(SX[0][nodes]);
}
}
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index 016d11b..ed42667 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -90,13 +90,13 @@ static void get_global_shape_fn_sph(struct All_variables *E,
for(d=1;d<=dims;d++)
for(i=1;i<=ends;i++)
- x[d] += E->X[lev][CPPR][d][E->IEN[lev][CPPR][el].node[i]]
+ x[d] += E->X[lev][d][E->IEN[lev][CPPR][el].node[i]]
* E->N.vpt[GNVINDEX(i,k)];
for(d=1;d<=dims;d++)
for(e=1;e<=dims;e++)
for(i=1;i<=ends;i++)
- dxda[d][e] += E->X[lev][CPPR][e][E->IEN[lev][CPPR][el].node[i]]
+ dxda[d][e] += E->X[lev][e][E->IEN[lev][CPPR][el].node[i]]
* E->Nx.vpt[GNVXINDEX(d-1,i,k)];
jacobian = determinant(dxda, E->mesh.nsd);
@@ -135,13 +135,13 @@ static void get_global_shape_fn_sph(struct All_variables *E,
for(d=1;d<=dims;d++)
for(i=1;i<=ends;i++)
- x[d] += E->X[lev][CPPR][d][E->IEN[lev][CPPR][el].node[i]]
+ x[d] += E->X[lev][d][E->IEN[lev][CPPR][el].node[i]]
* E->N.ppt[GNPINDEX(i,k)];
for(d=1;d<=dims;d++)
for(e=1;e<=dims;e++)
for(i=1;i<=ends;i++)
- dxda[d][e] += E->X[lev][CPPR][e][E->IEN[lev][CPPR][el].node[i]]
+ dxda[d][e] += E->X[lev][e][E->IEN[lev][CPPR][el].node[i]]
* E->Nx.ppt[GNPXINDEX(d-1,i,k)];
jacobian = determinant(dxda,E->mesh.nsd);
@@ -204,7 +204,7 @@ void get_rtf_at_vpts(struct All_variables *E, int lev, int el, double rtf[4][9])
for(d=1;d<=dims;d++)
for(i=1;i<=ends;i++)
- x[d] += E->X[lev][CPPR][d][E->IEN[lev][CPPR][el].node[i]]
+ x[d] += E->X[lev][d][E->IEN[lev][CPPR][el].node[i]]
* E->N.vpt[GNVINDEX(i,k)];
rtf[3][k] = 1.0/sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]); /* 1/r */
@@ -231,7 +231,7 @@ void get_rtf_at_ppts(struct All_variables *E, int lev, int el, double rtf[4][9])
for(d=1;d<=dims;d++)
for(i=1;i<=ends;i++)
- x[d] += E->X[lev][CPPR][d][E->IEN[lev][CPPR][el].node[i]]
+ x[d] += E->X[lev][d][E->IEN[lev][CPPR][el].node[i]]
* E->N.ppt[GNPINDEX(i,k)];
rtf[3][k] = 1.0/sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]);
@@ -539,7 +539,7 @@ void construct_c3x3matrix_el (struct All_variables *E,int el,struct CC *cc,
for(d=1;d<=dims;d++)
for(a=1;a<=ends;a++)
- x[d] += E->X[lev][CPPR][d][E->IEN[lev][CPPR][el].node[a]]
+ x[d] += E->X[lev][d][E->IEN[lev][CPPR][el].node[a]]
*E->N.vpt[GNVINDEX(a,k)];
rr = sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]);
@@ -600,7 +600,7 @@ void construct_c3x3matrix_el (struct All_variables *E,int el,struct CC *cc,
for(d=1;d<=dims;d++)
for(a=1;a<=ends;a++)
- x[d] += E->X[lev][CPPR][d][E->IEN[lev][CPPR][el].node[a]]
+ x[d] += E->X[lev][d][E->IEN[lev][CPPR][el].node[a]]
*E->N.ppt[GNPINDEX(a,k)];
rr = sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]);
@@ -679,7 +679,7 @@ void construct_side_c3x3matrix_el(struct All_variables *E,int el,
for(d=1;d<=dims;d++)
for(aa=1;aa<=ends;aa++) {
a=sidenodes[side][aa];
- x[d] += E->X[lev][CPPR][d][E->IEN[lev][CPPR][el].node[a]]
+ x[d] += E->X[lev][d][E->IEN[lev][CPPR][el].node[a]]
*E->M.vpt[GMVINDEX(aa,k)];
}
@@ -741,7 +741,7 @@ void construct_side_c3x3matrix_el(struct All_variables *E,int el,
x[d]=0.0;
for(a=1;a<=ends;a++) {
aa=sidenodes[side][a];
- x[d] += E->X[lev][CPPR][d][E->IEN[lev][CPPR][el].node[aa]]
+ x[d] += E->X[lev][d][E->IEN[lev][CPPR][el].node[aa]]
*E->M.ppt[GMPINDEX(a,k)];
}
rr = sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]);
@@ -823,7 +823,7 @@ void construct_c3x3matrix(E)
for(d=1;d<=dims;d++)
for(a=1;a<=ends;a++)
- x[d] += E->X[lev][CPPR][d][E->IEN[lev][CPPR][el].node[a]]
+ x[d] += E->X[lev][d][E->IEN[lev][CPPR][el].node[a]]
*E->N.vpt[GNVINDEX(a,k)];
rr = sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]);
@@ -881,7 +881,7 @@ void construct_c3x3matrix(E)
for(d=1;d<=dims;d++)
for(a=1;a<=ends;a++)
- x[d] += E->X[lev][CPPR][d][E->IEN[lev][CPPR][el].node[a]]
+ x[d] += E->X[lev][d][E->IEN[lev][CPPR][el].node[a]]
*E->N.ppt[GNPINDEX(a,k)];
rr = sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]);
@@ -974,7 +974,7 @@ void mass_matrix(struct All_variables *E)
for(i=1;i<=E->mesh.nsd;i++) {
for(node=1;node<=enodes[E->mesh.nsd];node++)
- centre[i] += E->X[lev][CPPR][i][n[node]];
+ centre[i] += E->X[lev][i][n[node]];
centre[i] = centre[i]/enodes[E->mesh.nsd];
} /* end for i */
diff --git a/lib/Sphere_util.c b/lib/Sphere_util.c
index 50d8db1..7046e77 100644
--- a/lib/Sphere_util.c
+++ b/lib/Sphere_util.c
@@ -97,9 +97,9 @@ void compute_angle_surf_area (E)
ia[i] = E->IEN[lev][CPPR][el].node[i];
for (i=1;i<=4;i++) {
- xx[1][i] = E->X[lev][CPPR][1][ia[i]]/E->SX[lev][3][ia[1]];
- xx[2][i] = E->X[lev][CPPR][2][ia[i]]/E->SX[lev][3][ia[1]];
- xx[3][i] = E->X[lev][CPPR][3][ia[i]]/E->SX[lev][3][ia[1]];
+ xx[1][i] = E->X[lev][1][ia[i]]/E->SX[lev][3][ia[1]];
+ xx[2][i] = E->X[lev][2][ia[i]]/E->SX[lev][3][ia[1]];
+ xx[3][i] = E->X[lev][3][ia[i]]/E->SX[lev][3][ia[1]];
}
get_angle_sphere_cap(xx,angle);
@@ -183,9 +183,9 @@ double area_of_5points(E,lev,el,x,ne)
es = (el-1)/E->lmesh.ELZ[lev]+1;
for (i=1;i<=4;i++) {
- xx[1] = E->X[lev][CPPR][1][ia[i]]/E->SX[lev][3][ia[1]];
- xx[2] = E->X[lev][CPPR][2][ia[i]]/E->SX[lev][3][ia[1]];
- xx[3] = E->X[lev][CPPR][3][ia[i]]/E->SX[lev][3][ia[1]];
+ xx[1] = E->X[lev][1][ia[i]]/E->SX[lev][3][ia[1]];
+ xx[2] = E->X[lev][2][ia[i]]/E->SX[lev][3][ia[1]];
+ xx[3] = E->X[lev][3][ia[i]]/E->SX[lev][3][ia[1]];
angle[i] = get_angle(x,xx); /* get angle bet (i,j) and other four*/
angle1[i]= E->sphere.angle1[lev][CPPR][i][es];
}
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 8a11d70..53d7397 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -835,7 +835,7 @@ struct All_variables {
double *temp,*temp1;
double *Mass, *MASS[MAX_LEVELS];
double *TMass, *NMass;
- double *SX[MAX_LEVELS][4],*X[MAX_LEVELS][NCS][4];
+ double *SX[MAX_LEVELS][4],*X[MAX_LEVELS][4];
double *sx[4],*x[4];
double *surf_det[NCS][5];
double *SinCos[MAX_LEVELS][NCS][4];
More information about the CIG-COMMITS
mailing list