[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->IEN as part of caps_per_proc removal (05b2a99)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:12:16 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 05b2a99abeb6988e872f7f2ff8017cc59fdaef32
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 17:04:42 2014 -0700
Changed the shape of E->IEN as part of caps_per_proc removal
>---------------------------------------------------------------
05b2a99abeb6988e872f7f2ff8017cc59fdaef32
lib/Construct_arrays.c | 6 +++---
lib/Element_calculations.c | 20 ++++++++++----------
lib/Global_operations.c | 2 +-
lib/Instructions.c | 4 ++--
lib/Nodal_mesh.c | 6 +++---
lib/Petsc_citcoms.c | 2 +-
lib/Size_does_matter.c | 42 +++++++++++++++++++++---------------------
lib/Solver_multigrid.c | 20 ++++++++++----------
lib/Sphere_util.c | 4 ++--
lib/global_defs.h | 2 +-
10 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index e337720..480dcbb 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -70,7 +70,7 @@ void construct_ien(E)
element = (r-1)*elx*elz + (q-1)*elz + p;
start = (r-1)*noz*nox + (q-1)*noz + p;
for(rr=1;rr<=ends;rr++)
- E->IEN[lev][CPPR][element].node[rr]= start
+ E->IEN[lev][element].node[rr]= start
+ offset[rr].vector[0]
+ offset[rr].vector[1]*noz
+ offset[rr].vector[2]*noz*nox;
@@ -353,7 +353,7 @@ void construct_node_ks(E)
build_diagonal_of_K(E,element,elt_K,level);
for(i=1;i<=ends;i++) { /* i, is the node we are storing to */
- node=E->IEN[level][CPPR][element].node[i];
+ node=E->IEN[level][element].node[i];
pp=(i-1)*dims;
w1=w2=w3=1.0;
@@ -365,7 +365,7 @@ void construct_node_ks(E)
if(E->NODE[level][node] & VBY) w2=0.0;
for(j=1;j<=ends;j++) { /* j is the node we are receiving from */
- node1=E->IEN[level][CPPR][element].node[j];
+ node1=E->IEN[level][element].node[j];
/* only for half of the matrix ,because of the symmetry */
if (node1<=node) {
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 650fff1..6d86aa2 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -453,12 +453,12 @@ void e_assemble_del2_u(E,u,Au,level,strip_bcs)
for(e=1;e<=nel;e++) {
for(a=1;a<=ends;a++) {
- ii = E->IEN[level][CPPR][e].node[a];
+ ii = E->IEN[level][e].node[a];
a1 = E->ID[level][CPPR][ii].doff[1];
a2 = E->ID[level][CPPR][ii].doff[2];
a3 = E->ID[level][CPPR][ii].doff[3];
for(b=1;b<=ends;b++) {
- nodeb = E->IEN[level][CPPR][e].node[b];
+ nodeb = E->IEN[level][e].node[b];
ii = (a*n+b)*dims-(dims*n+dims);
/* i=1, j=1,2,3 */
Au[a1] +=
@@ -571,7 +571,7 @@ void build_diagonal_of_K(E,el,elt_k,level)
const int ends=enodes[E->mesh.nsd];
for(a=1;a<=ends;a++) {
- node=E->IEN[level][CPPR][el].node[a];
+ node=E->IEN[level][el].node[a];
/* dirn 1 */
a1 = E->ID[level][CPPR][node].doff[1];
p=(a-1)*dims;
@@ -637,7 +637,7 @@ void assemble_c_u(struct All_variables *E,
for(a=1;a<=ends;a++) {
p = (a-1)*dims;
for(e=0;e<nel;e++) {
- b = E->IEN[level][CPPR][e].node[a];
+ b = E->IEN[level][e].node[a];
j1= E->ID[level][CPPR][b].doff[1];
j2= E->ID[level][CPPR][b].doff[2];
j3= E->ID[level][CPPR][b].doff[3];
@@ -685,7 +685,7 @@ void assemble_div_u(struct All_variables *E,
for(a=1;a<=ends;a++) {
p = (a-1)*dims;
for(e=0;e<nel;e++) {
- b = E->IEN[level][CPPR][e+1].node[a];
+ b = E->IEN[level][e+1].node[a];
j1= E->ID[level][CPPR][b].doff[1];
j2= E->ID[level][CPPR][b].doff[2];
j3= E->ID[level][CPPR][b].doff[3];
@@ -725,7 +725,7 @@ void assemble_grad_p(E,P,gradP,lev)
for(a=1;a<=ends;a++) {
p = (a-1)*dims;
- b = E->IEN[lev][CPPR][e+1].node[a];
+ b = E->IEN[lev][e+1].node[a];
j1= E->ID[lev][CPPR][b].doff[1];
j2= E->ID[lev][CPPR][b].doff[2];
j3= E->ID[lev][CPPR][b].doff[3];
@@ -761,7 +761,7 @@ double assemble_dAhatp_entry(struct All_variables *E, int e, int level)
for(a=1;a<=ends;a++) {
p = (a-1)*dims;
- node = E->IEN[level][CPPR][e+1].node[a];
+ node = E->IEN[level][e+1].node[a];
j=E->ID[level][CPPR][node].doff[1];
gradP[p] += E->BI[level][j]*E->elt_del[level][CPPR][e+1].g[p][0];
@@ -833,7 +833,7 @@ void get_elt_c(struct All_variables *E, int el, higher_precision elt_c[24][1], i
/* compute d(rho)/dr/rho from rho(r) */
for(a=1;a<=ends;a++) {
- j = E->IEN[lev][CPPR][el].node[a];
+ j = E->IEN[lev][el].node[a];
nz = (j - 1) % E->lmesh.noz + 1;
rho[a] = E->refstate.rho[nz];
}
@@ -1252,9 +1252,9 @@ void get_aug_k(E,el,elt_k,level)
Visc = Visc/vpts;
for(a=1;a<=ends;a++) {
- nodea=E->IEN[level][CPPR][el].node[a];
+ nodea=E->IEN[level][el].node[a];
for(b=1;b<=ends;b++) {
- nodeb=E->IEN[level][CPPR][el].node[b]; /* for Kab dims*dims */
+ nodeb=E->IEN[level][el].node[b]; /* for Kab dims*dims */
i = (a-1)*n*dims+(b-1)*dims;
elt_k[i ] += Visc*E->control.augmented*
E->elt_del[level][CPPR][el].g[p[a]][0]*
diff --git a/lib/Global_operations.c b/lib/Global_operations.c
index 8e1f0de..16baac6 100644
--- a/lib/Global_operations.c
+++ b/lib/Global_operations.c
@@ -755,7 +755,7 @@ double vnorm_nonnewt(E,dU,U,lev)
/*if (E->mat[m][e]==1)*/
for (i=1;i<=dims;i++)
for (a=1;a<=ends;a++) {
- node = E->IEN[lev][CPPR][e].node[a];
+ node = E->IEN[lev][e].node[a];
dtemp += dU[ E->ID[lev][CPPR][node].doff[i] ]*
dU[ E->ID[lev][CPPR][node].doff[i] ];
temp += U[ E->ID[lev][CPPR][node].doff[i] ]*
diff --git a/lib/Instructions.c b/lib/Instructions.c
index aa627c3..cd86ec5 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1023,7 +1023,7 @@ void allocate_common_vars(E)
for(d=0;d<=3;d++)
E->SinCos[i][d] = (double *) malloc((nno+1)*sizeof(double));
- E->IEN[i][CPPR] = (struct IEN *) malloc((nel+2)*sizeof(struct IEN));
+ E->IEN[i] = (struct IEN *) malloc((nel+2)*sizeof(struct IEN));
E->EL[i][CPPR] = (struct SUBEL *) malloc((nel+2)*sizeof(struct SUBEL));
E->sphere.area1[i][CPPR] = (double *) malloc((snel+1)*sizeof(double));
for (k=1;k<=4;k++)
@@ -1352,7 +1352,7 @@ void set_up_nonmg_aliases(struct All_variables *E)
int i;
E->eco = E->ECO[E->mesh.levmax];
- E->ien = E->IEN[E->mesh.levmax][CPPR];
+ E->ien = E->IEN[E->mesh.levmax];
E->id = E->ID[E->mesh.levmax][CPPR];
E->Vi = E->VI[E->mesh.levmax];
E->EVi = E->EVI[E->mesh.levmax];
diff --git a/lib/Nodal_mesh.c b/lib/Nodal_mesh.c
index 1ce96c1..45b3c4a 100644
--- a/lib/Nodal_mesh.c
+++ b/lib/Nodal_mesh.c
@@ -202,7 +202,7 @@ void p_to_nodes(E,P,PN,lev)
for(element=0;element<E->lmesh.NEL[lev];element++)
for(j=1;j<=enodes[E->mesh.nsd];j++) {
- node = E->IEN[lev][CPPR][element+1].node[j];
+ node = E->IEN[lev][element+1].node[j];
PN[node] += P[element] * E->TWW[lev][CPPR][element+1].node[j] ;
}
@@ -238,7 +238,7 @@ void visc_from_gint_to_nodes(E,VE,VN,lev)
temp_visc = temp_visc/vpts;
for(j=1;j<=ends;j++) {
- n = E->IEN[lev][CPPR][e].node[j];
+ n = E->IEN[lev][e].node[j];
VN[n] += E->TWW[lev][CPPR][e].node[j] * temp_visc;
}
}
@@ -272,7 +272,7 @@ void visc_from_nodes_to_gint(E,VN,VE,lev)
for(i=1;i<=vpts;i++) {
temp_visc=0.0;
for(j=1;j<=ends;j++)
- temp_visc += E->N.vpt[GNVINDEX(j,i)]*VN[E->IEN[lev][CPPR][e].node[j]];
+ temp_visc += E->N.vpt[GNVINDEX(j,i)]*VN[E->IEN[lev][e].node[j]];
VE[(e-1)*vpts+i] = temp_visc;
}
}
diff --git a/lib/Petsc_citcoms.c b/lib/Petsc_citcoms.c
index 7c09f25..bacfd54 100644
--- a/lib/Petsc_citcoms.c
+++ b/lib/Petsc_citcoms.c
@@ -100,7 +100,7 @@ PetscErrorCode assemble_c_u_PETSc( struct All_variables *E, Vec U, Vec result, i
for(a=1;a<=ends;a++) {
p = (a-1)*dims;
for(e=0;e<nel;e++) {
- b = E->IEN[level][CPPR][e+1].node[a];
+ b = E->IEN[level][e+1].node[a];
j1= E->ID[level][CPPR][b].doff[1];
j2= E->ID[level][CPPR][b].doff[2];
j3= E->ID[level][CPPR][b].doff[3];
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index a0bf243..f734377 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][d][E->IEN[lev][CPPR][el].node[i]]
+ x[d] += E->X[lev][d][E->IEN[lev][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][e][E->IEN[lev][CPPR][el].node[i]]
+ dxda[d][e] += E->X[lev][e][E->IEN[lev][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][d][E->IEN[lev][CPPR][el].node[i]]
+ x[d] += E->X[lev][d][E->IEN[lev][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][e][E->IEN[lev][CPPR][el].node[i]]
+ dxda[d][e] += E->X[lev][e][E->IEN[lev][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][d][E->IEN[lev][CPPR][el].node[i]]
+ x[d] += E->X[lev][d][E->IEN[lev][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][d][E->IEN[lev][CPPR][el].node[i]]
+ x[d] += E->X[lev][d][E->IEN[lev][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][d][E->IEN[lev][CPPR][el].node[a]]
+ x[d] += E->X[lev][d][E->IEN[lev][el].node[a]]
*E->N.vpt[GNVINDEX(a,k)];
rr = sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]);
@@ -567,8 +567,8 @@ void construct_c3x3matrix_el (struct All_variables *E,int el,struct CC *cc,
ux[2][3][1] =-sintt*sinff; ux[2][3][2] = sintt*cosff; ux[2][3][3] =0.0;
for(a=1;a<=ends;a++) {
- tt = E->SX[lev][1][E->IEN[lev][CPPR][el].node[a]];
- ff = E->SX[lev][2][E->IEN[lev][CPPR][el].node[a]];
+ tt = E->SX[lev][1][E->IEN[lev][el].node[a]];
+ ff = E->SX[lev][2][E->IEN[lev][el].node[a]];
costt = cos(tt);
cosff = cos(ff);
sintt = sin(tt);
@@ -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][d][E->IEN[lev][CPPR][el].node[a]]
+ x[d] += E->X[lev][d][E->IEN[lev][el].node[a]]
*E->N.ppt[GNPINDEX(a,k)];
rr = sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]);
@@ -629,7 +629,7 @@ void construct_c3x3matrix_el (struct All_variables *E,int el,struct CC *cc,
for(a=1;a<=ends;a++) {
- lnode = E->IEN[lev][CPPR][el].node[a];
+ lnode = E->IEN[lev][el].node[a];
sintt = E->SinCos[lev][0][lnode];
sinff = E->SinCos[lev][1][lnode];
costt = E->SinCos[lev][2][lnode];
@@ -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][d][E->IEN[lev][CPPR][el].node[a]]
+ x[d] += E->X[lev][d][E->IEN[lev][el].node[a]]
*E->M.vpt[GMVINDEX(aa,k)];
}
@@ -712,7 +712,7 @@ void construct_side_c3x3matrix_el(struct All_variables *E,int el,
for(aa=1;aa<=ends;aa++) {
a=sidenodes[side][aa];
- lnode = E->IEN[lev][CPPR][el].node[a];
+ lnode = E->IEN[lev][el].node[a];
sintt = E->SinCos[lev][0][lnode];
sinff = E->SinCos[lev][1][lnode];
costt = E->SinCos[lev][2][lnode];
@@ -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][d][E->IEN[lev][CPPR][el].node[aa]]
+ x[d] += E->X[lev][d][E->IEN[lev][el].node[aa]]
*E->M.ppt[GMPINDEX(a,k)];
}
rr = sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]);
@@ -771,7 +771,7 @@ void construct_side_c3x3matrix_el(struct All_variables *E,int el,
for(a=1;a<=ends;a++) {
aa=sidenodes[side][a];
- lnode = E->IEN[lev][CPPR][el].node[aa];
+ lnode = E->IEN[lev][el].node[aa];
sintt = E->SinCos[lev][0][lnode];
sinff = E->SinCos[lev][1][lnode];
costt = E->SinCos[lev][2][lnode];
@@ -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][d][E->IEN[lev][CPPR][el].node[a]]
+ x[d] += E->X[lev][d][E->IEN[lev][el].node[a]]
*E->N.vpt[GNVINDEX(a,k)];
rr = sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]);
@@ -852,7 +852,7 @@ void construct_c3x3matrix(E)
for(a=1;a<=ends;a++) {
- lnode = E->IEN[lev][CPPR][el].node[a];
+ lnode = E->IEN[lev][el].node[a];
sintt = E->SinCos[lev][0][lnode];
sinff = E->SinCos[lev][1][lnode];
costt = E->SinCos[lev][2][lnode];
@@ -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][d][E->IEN[lev][CPPR][el].node[a]]
+ x[d] += E->X[lev][d][E->IEN[lev][el].node[a]]
*E->N.ppt[GNPINDEX(a,k)];
rr = sqrt(x[1]*x[1]+x[2]*x[2]+x[3]*x[3]);
@@ -910,7 +910,7 @@ void construct_c3x3matrix(E)
for(a=1;a<=ends;a++) {
- lnode = E->IEN[lev][CPPR][el].node[a];
+ lnode = E->IEN[lev][el].node[a];
sintt = E->SinCos[lev][0][lnode];
sinff = E->SinCos[lev][1][lnode];
costt = E->SinCos[lev][2][lnode];
@@ -970,7 +970,7 @@ void mass_matrix(struct All_variables *E)
area = centre[1] = centre[2] = centre[3] = 0.0;
for(node=1;node<=enodes[E->mesh.nsd];node++)
- n[node] = E->IEN[lev][CPPR][e].node[node];
+ n[node] = E->IEN[lev][e].node[node];
for(i=1;i<=E->mesh.nsd;i++) {
for(node=1;node<=enodes[E->mesh.nsd];node++)
@@ -1035,7 +1035,7 @@ void mass_matrix(struct All_variables *E)
}
for(node=1;node<=enodes[E->mesh.nsd];node++)
- E->MASS[lev][E->IEN[lev][CPPR][e].node[node]] += temp[node];
+ E->MASS[lev][E->IEN[lev][e].node[node]] += temp[node];
/* weight of each node, equivalent to pmass in ConMan */
for(node=1;node<=enodes[E->mesh.nsd];node++)
diff --git a/lib/Solver_multigrid.c b/lib/Solver_multigrid.c
index 5044d45..42bdc90 100644
--- a/lib/Solver_multigrid.c
+++ b/lib/Solver_multigrid.c
@@ -78,8 +78,8 @@ void inject_scalar(E,start_lev,AU,AD)
for(el=1;el<=E->lmesh.NEL[sl_minus];el++)
for(i=1;i<=ends;i++) {
- node_coarse = E->IEN[sl_minus][CPPR][el].node[i];
- node_fine=E->IEN[start_lev][CPPR][E->EL[sl_minus][CPPR][el].sub[i]].node[i];
+ node_coarse = E->IEN[sl_minus][el].node[i];
+ node_fine=E->IEN[start_lev][E->EL[sl_minus][CPPR][el].sub[i]].node[i];
AD[node_coarse] = AU[node_fine];
}
}
@@ -106,8 +106,8 @@ void inject_vector(E,start_lev,AU,AD)
for(el=1;el<=E->lmesh.NEL[sl_minus];el++)
for(i=1;i<=ends;i++) {
- node_coarse = E->IEN[sl_minus][CPPR][el].node[i];
- node_fine=E->IEN[start_lev][CPPR][E->EL[sl_minus][CPPR][el].sub[i]].node[i];
+ node_coarse = E->IEN[sl_minus][el].node[i];
+ node_fine=E->IEN[start_lev][E->EL[sl_minus][CPPR][el].sub[i]].node[i];
for (j=1;j<=dims;j++) {
eqn_fine = E->ID[start_lev][CPPR][node_fine].doff[j];
eqn_coarse = E->ID[sl_minus][CPPR][node_coarse].doff[j];
@@ -147,8 +147,8 @@ void un_inject_vector(E,start_lev,AD,AU)
for(el=1;el<=nels;el++)
for(i=1;i<=ENODES3D;i++) {
- node = E->IEN[start_lev][CPPR][el].node[i];
- node_plus=E->IEN[sl_plus][CPPR][E->EL[start_lev][CPPR][el].sub[i]].node[i];
+ node = E->IEN[start_lev][el].node[i];
+ node_plus=E->IEN[sl_plus][E->EL[start_lev][CPPR][el].sub[i]].node[i];
eqn1 = E->ID[start_lev][CPPR][node].doff[1];
eqn2 = E->ID[start_lev][CPPR][node].doff[2];
@@ -451,13 +451,13 @@ void project_scalar(E,start_lev,AU,AD)
average=0.0;
node1 = E->EL[sl_minus][CPPR][el].sub[i];
for(j=1;j<=ENODES3D;j++) {
- node=E->IEN[start_lev][CPPR][node1].node[j];
+ node=E->IEN[start_lev][node1].node[j];
average += AU[node];
}
w=weight*average;
- node= E->IEN[sl_minus][CPPR][el].node[i];
+ node= E->IEN[sl_minus][el].node[i];
AD[node] += w * E->TWW[sl_minus][CPPR][el].node[i];
}
@@ -513,11 +513,11 @@ void project_vector(E,start_lev,AU,AD,ic)
/* smooth in xyz coordinates */
for(el=1;el<=nels_minus;el++)
for(i=1;i<=ENODES3D;i++) {
- node= E->IEN[sl_minus][CPPR][el].node[i];
+ node= E->IEN[sl_minus][el].node[i];
average1=average2=average3=0.0;
e1 = E->EL[sl_minus][CPPR][el].sub[i];
for(j=1;j<=ENODES3D;j++) {
- node1=E->IEN[start_lev][CPPR][e1].node[j];
+ node1=E->IEN[start_lev][e1].node[j];
average1 += E->temp[E->ID[start_lev][CPPR][node1].doff[1]];
average2 += E->temp[E->ID[start_lev][CPPR][node1].doff[2]];
average3 += E->temp[E->ID[start_lev][CPPR][node1].doff[3]];
diff --git a/lib/Sphere_util.c b/lib/Sphere_util.c
index 7046e77..cb67a6c 100644
--- a/lib/Sphere_util.c
+++ b/lib/Sphere_util.c
@@ -94,7 +94,7 @@ void compute_angle_surf_area (E)
for (es=1;es<=E->lmesh.SNEL[lev];es++) {
el = (es-1)*E->lmesh.ELZ[lev]+1;
for (i=1;i<=4;i++)
- ia[i] = E->IEN[lev][CPPR][el].node[i];
+ ia[i] = E->IEN[lev][el].node[i];
for (i=1;i<=4;i++) {
xx[1][i] = E->X[lev][1][ia[i]]/E->SX[lev][3][ia[1]];
@@ -178,7 +178,7 @@ double area_of_5points(E,lev,el,x,ne)
double xx[4],angle[5],angle1[5];
for (i=1;i<=4;i++)
- ia[i] = E->IEN[lev][CPPR][el].node[i];
+ ia[i] = E->IEN[lev][el].node[i];
es = (el-1)/E->lmesh.ELZ[lev]+1;
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 35a8621..adc08cf 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -801,7 +801,7 @@ struct All_variables {
struct SIEN *sien;
struct ID *id;
struct COORD *ECO[MAX_LEVELS];
- struct IEN *IEN[MAX_LEVELS][NCS]; /* global at each level */
+ struct IEN *IEN[MAX_LEVELS]; /* global at each level */
struct FNODE *TWW[MAX_LEVELS][NCS]; /* for nodal averages */
struct ID *ID[MAX_LEVELS][NCS];
struct SUBEL *EL[MAX_LEVELS][NCS];
More information about the CIG-COMMITS
mailing list