[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->elt_del as part of caps_per_proc removal (1fb56e6)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:12:25 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 1fb56e6c33d5ef9019f2e6f55df4327f6240059d
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 18:02:38 2014 -0700
Changed the shape of E->elt_del as part of caps_per_proc removal
>---------------------------------------------------------------
1fb56e6c33d5ef9019f2e6f55df4327f6240059d
lib/Construct_arrays.c | 2 +-
lib/Element_calculations.c | 60 +++++++++++++++++++++++-----------------------
lib/Instructions.c | 2 +-
lib/Topo_gravity.c | 4 ++--
lib/global_defs.h | 2 +-
5 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index b2f5ac7..34c6849 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -651,7 +651,7 @@ void construct_elt_gs(E)
for(lev=E->mesh.gridmin;lev<=E->mesh.gridmax;lev++)
for(el=1;el<=E->lmesh.NEL[lev];el++)
- get_elt_g(E,el,E->elt_del[lev][CPPR][el].g,lev);
+ get_elt_g(E,el,E->elt_del[lev][el].g,lev);
}
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index b19c9bb..f77db72 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -689,9 +689,9 @@ void assemble_div_u(struct All_variables *E,
j1= E->ID[level][b].doff[1];
j2= E->ID[level][b].doff[2];
j3= E->ID[level][b].doff[3];
- divU[e] += E->elt_del[level][CPPR][e+1].g[p ][0] * U[j1]
- + E->elt_del[level][CPPR][e+1].g[p+1][0] * U[j2]
- + E->elt_del[level][CPPR][e+1].g[p+2][0] * U[j3];
+ divU[e] += E->elt_del[level][e+1].g[p ][0] * U[j1]
+ + E->elt_del[level][e+1].g[p+1][0] * U[j2]
+ + E->elt_del[level][e+1].g[p+2][0] * U[j3];
}
}
}
@@ -730,9 +730,9 @@ void assemble_grad_p(E,P,gradP,lev)
j2= E->ID[lev][b].doff[2];
j3= E->ID[lev][b].doff[3];
/*for(b=0;b<ploc_mat_size[E->mesh.nsd];b++) */
- gradP[j1] += E->elt_del[lev][CPPR][e+1].g[p ][0] * P[e];
- gradP[j2] += E->elt_del[lev][CPPR][e+1].g[p+1][0] * P[e];
- gradP[j3] += E->elt_del[lev][CPPR][e+1].g[p+2][0] * P[e];
+ gradP[j1] += E->elt_del[lev][e+1].g[p ][0] * P[e];
+ gradP[j2] += E->elt_del[lev][e+1].g[p+1][0] * P[e];
+ gradP[j3] += E->elt_del[lev][e+1].g[p+2][0] * P[e];
}
} /* end for el */
@@ -763,13 +763,13 @@ double assemble_dAhatp_entry(struct All_variables *E, int e, int level)
p = (a-1)*dims;
node = E->IEN[level][e+1].node[a];
j=E->ID[level][node].doff[1];
- gradP[p] += E->BI[level][j]*E->elt_del[level][CPPR][e+1].g[p][0];
+ gradP[p] += E->BI[level][j]*E->elt_del[level][e+1].g[p][0];
j=E->ID[level][node].doff[2];
- gradP[p+1] += E->BI[level][j]*E->elt_del[level][CPPR][e+1].g[p+1][0];
+ gradP[p+1] += E->BI[level][j]*E->elt_del[level][e+1].g[p+1][0];
j=E->ID[level][node].doff[3];
- gradP[p+2] += E->BI[level][j]*E->elt_del[level][CPPR][e+1].g[p+2][0];
+ gradP[p+2] += E->BI[level][j]*E->elt_del[level][e+1].g[p+2][0];
}
@@ -782,9 +782,9 @@ double assemble_dAhatp_entry(struct All_variables *E, int e, int level)
for(b=1;b<=ends;b++) {
p = (b-1)*dims;
- divU +=E->elt_del[level][CPPR][e+1].g[p][0] * gradP[p];
- divU +=E->elt_del[level][CPPR][e+1].g[p+1][0] * gradP[p+1];
- divU +=E->elt_del[level][CPPR][e+1].g[p+2][0] * gradP[p+2];
+ divU +=E->elt_del[level][e+1].g[p][0] * gradP[p];
+ divU +=E->elt_del[level][e+1].g[p+1][0] * gradP[p+1];
+ divU +=E->elt_del[level][e+1].g[p+2][0] * gradP[p+2];
}
return(divU);
@@ -1257,34 +1257,34 @@ void get_aug_k(E,el,elt_k,level)
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]*
- E->elt_del[level][CPPR][el].g[p[b]][0]; /*for 11 */
+ E->elt_del[level][el].g[p[a]][0]*
+ E->elt_del[level][el].g[p[b]][0]; /*for 11 */
elt_k[i+1] += Visc*E->control.augmented*
- E->elt_del[level][CPPR][el].g[p[a]][0]*
- E->elt_del[level][CPPR][el].g[p[b]+1][0]; /* for 12 */
+ E->elt_del[level][el].g[p[a]][0]*
+ E->elt_del[level][el].g[p[b]+1][0]; /* for 12 */
elt_k[i+n] += Visc*E->control.augmented*
- E->elt_del[level][CPPR][el].g[p[a]+1][0]*
- E->elt_del[level][CPPR][el].g[p[b]][0]; /* for 21 */
+ E->elt_del[level][el].g[p[a]+1][0]*
+ E->elt_del[level][el].g[p[b]][0]; /* for 21 */
elt_k[i+n+1] += Visc*E->control.augmented*
- E->elt_del[level][CPPR][el].g[p[a]+1][0]*
- E->elt_del[level][CPPR][el].g[p[b]+1][0]; /* for 22 */
+ E->elt_del[level][el].g[p[a]+1][0]*
+ E->elt_del[level][el].g[p[b]+1][0]; /* for 22 */
if(3==dims) {
elt_k[i+2] += Visc*E->control.augmented*
- E->elt_del[level][CPPR][el].g[p[a]][0]*
- E->elt_del[level][CPPR][el].g[p[b]+2][0]; /* for 13 */
+ E->elt_del[level][el].g[p[a]][0]*
+ E->elt_del[level][el].g[p[b]+2][0]; /* for 13 */
elt_k[i+n+2] += Visc*E->control.augmented*
- E->elt_del[level][CPPR][el].g[p[a]+1][0]*
- E->elt_del[level][CPPR][el].g[p[b]+2][0]; /* for 23 */
+ E->elt_del[level][el].g[p[a]+1][0]*
+ E->elt_del[level][el].g[p[b]+2][0]; /* for 23 */
elt_k[i+n+n] += Visc*E->control.augmented*
- E->elt_del[level][CPPR][el].g[p[a]+2][0]*
- E->elt_del[level][CPPR][el].g[p[b]][0]; /* for 31 */
+ E->elt_del[level][el].g[p[a]+2][0]*
+ E->elt_del[level][el].g[p[b]][0]; /* for 31 */
elt_k[i+n+n+1] += Visc*E->control.augmented*
- E->elt_del[level][CPPR][el].g[p[a]+2][0]*
- E->elt_del[level][CPPR][el].g[p[b]+1][0]; /* for 32 */
+ E->elt_del[level][el].g[p[a]+2][0]*
+ E->elt_del[level][el].g[p[b]+1][0]; /* for 32 */
elt_k[i+n+n+2] += Visc*E->control.augmented*
- E->elt_del[level][CPPR][el].g[p[a]+2][0]*
- E->elt_del[level][CPPR][el].g[p[b]+2][0]; /* for 33 */
+ E->elt_del[level][el].g[p[a]+2][0]*
+ E->elt_del[level][el].g[p[b]+2][0]; /* for 33 */
}
}
}
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 36472cb..2327255 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1065,7 +1065,7 @@ void allocate_common_vars(E)
E->CC[i][CPPR] =(struct CC *) malloc((1)*sizeof(struct CC));
E->CCX[i][CPPR]=(struct CCX *) malloc((1)*sizeof(struct CCX));
- E->elt_del[i][CPPR] = (struct EG *) malloc((nel+1)*sizeof(struct EG));
+ E->elt_del[i] = (struct EG *) malloc((nel+1)*sizeof(struct EG));
if(E->control.inv_gruneisen != 0)
E->elt_c[i][CPPR] = (struct EC *) malloc((nel+1)*sizeof(struct EC));
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 079be71..f90a187 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -1000,8 +1000,8 @@ void get_CBF_topo(E,H,HB) /* call this only for top and bottom processors*
}
for(m=0;m<dims*ends;m++) {
- res[m] = eltf[m] - E->elt_del[lev][CPPR][el].g[m][0] * E->P[el-1];
- resb[m] = eltfb[m] - E->elt_del[lev][CPPR][elb].g[m][0]* E->P[elb-1];
+ res[m] = eltf[m] - E->elt_del[lev][el].g[m][0] * E->P[el-1];
+ resb[m] = eltfb[m] - E->elt_del[lev][elb].g[m][0]* E->P[elb-1];
}
for(m=0;m<dims*ends;m++)
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 94dd7f8..65ec322 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -805,7 +805,7 @@ struct All_variables {
struct FNODE *TWW[MAX_LEVELS]; /* for nodal averages */
struct ID *ID[MAX_LEVELS];
struct SUBEL *EL[MAX_LEVELS];
- struct EG *elt_del[MAX_LEVELS][NCS];
+ struct EG *elt_del[MAX_LEVELS];
struct EC *elt_c[MAX_LEVELS][NCS];
struct EK *elt_k[MAX_LEVELS][NCS];
struct CC *cc;
More information about the CIG-COMMITS
mailing list