[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->node as part of caps_per_proc removal; corrected the signature of pg_solver, element_residual (c9d2a60)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:11:34 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit c9d2a60c8943614964ddb17fcf2b487d6502cc61
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 13:59:02 2014 -0700
Changed the shape of E->node as part of caps_per_proc removal; corrected the signature of pg_solver, element_residual
>---------------------------------------------------------------
c9d2a60c8943614964ddb17fcf2b487d6502cc61
lib/Advection_diffusion.c | 16 ++++++------
lib/BC_util.c | 8 +++---
lib/Element_calculations.c | 10 ++++----
lib/Instructions.c | 14 +++++------
lib/Lith_age.c | 50 +++++++++++++++++++-------------------
lib/Nodal_mesh.c | 12 ++++-----
lib/Pan_problem_misc_functions.c | 6 ++---
lib/Regional_boundary_conditions.c | 18 +++++++-------
lib/Topo_gravity.c | 6 ++---
lib/global_defs.h | 2 +-
10 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/lib/Advection_diffusion.c b/lib/Advection_diffusion.c
index 45ecd41..2d9b062 100644
--- a/lib/Advection_diffusion.c
+++ b/lib/Advection_diffusion.c
@@ -45,7 +45,7 @@ static void corrector(struct All_variables *E, double *field,
static void pg_solver(struct All_variables *E,
double *T, double *Tdot, double *DTdot,
struct SOURCES *Q0,
- double diff, int bc, unsigned int **FLAGS);
+ double diff, int bc, unsigned int *FLAGS);
static void pg_shape_fn(struct All_variables *E, int el,
struct Shape_function *PG,
struct Shape_function_dx *GNx,
@@ -60,7 +60,7 @@ static void element_residual(struct All_variables *E, int el,
struct SOURCES *Q0,
double Eres[9], double rtf[4][9],
double diff, float **BC,
- unsigned int **FLAGS);
+ unsigned int *FLAGS);
static void filter(struct All_variables *E);
static void process_heating(struct All_variables *E, int psc_pass);
@@ -353,7 +353,7 @@ static void corrector(struct All_variables *E, double *field,
static void pg_solver(struct All_variables *E,
double *T, double *Tdot, double *DTdot,
struct SOURCES *Q0,
- double diff, int bc, unsigned int **FLAGS)
+ double diff, int bc, unsigned int *FLAGS)
{
void get_rtf_at_vpts();
void velo_from_element();
@@ -396,7 +396,7 @@ static void pg_solver(struct All_variables *E,
(E->exchange_node_d)(E,DTdot,lev);
for(i=1;i<=E->lmesh.nno;i++) {
- if(!(E->node[CPPR][i] & (TBX | TBY | TBZ))){
+ if(!(E->node[i] & (TBX | TBY | TBZ))){
DTdot[i] *= E->TMass[i]; /* lumped mass matrix */
} else {
DTdot[i] = 0.0; /* lumped mass matrix */
@@ -487,7 +487,7 @@ static void element_residual(struct All_variables *E, int el,
struct SOURCES *Q0,
double Eres[9], double rtf[4][9],
double diff, float **BC,
- unsigned int **FLAGS)
+ unsigned int *FLAGS)
{
int i,j,a,k,node,nodes[5],d,aid,back_front,onedfns;
double Q;
@@ -527,7 +527,7 @@ static void element_residual(struct All_variables *E, int el,
for(j=1;j<=ends;j++) {
node = E->ien[el].node[j];
T = field[node];
- if(E->node[CPPR][node] & (TBX | TBY | TBZ))
+ if(E->node[node] & (TBX | TBY | TBZ))
DT=0.0;
else
DT = fielddot[node];
@@ -607,11 +607,11 @@ static void element_residual(struct All_variables *E, int el,
if(FLAGS!=NULL) {
aid = -1;
- if (FLAGS[CPPR][E->ien[el].node[1]] & FBZ) { // only check for the 1st node
+ if (FLAGS[E->ien[el].node[1]] & FBZ) { // only check for the 1st node
aid = 0;
get_global_1d_shape_fn(E,el,&GM,&dGamma,aid);
}
- else if (FLAGS[CPPR][E->ien[el].node[5]] & FBZ) { // only check for the 5th node
+ else if (FLAGS[E->ien[el].node[5]] & FBZ) { // only check for the 5th node
aid = 1;
get_global_1d_shape_fn(E,el,&GM,&dGamma,aid);
}
diff --git a/lib/BC_util.c b/lib/BC_util.c
index 69fe70e..88418f8 100644
--- a/lib/BC_util.c
+++ b/lib/BC_util.c
@@ -127,7 +127,7 @@ void temperatures_conform_bcs2(E)
for(node=1;node<=E->lmesh.nno;node++) {
- type = (E->node[CPPR][node] & (TBX | TBZ | TBY));
+ type = (E->node[node] & (TBX | TBZ | TBY));
switch (type) {
case 0: /* no match, next node */
@@ -174,11 +174,11 @@ void velocities_conform_bcs(E,U)
for(node=1;node<=nno;node++) {
- if (E->node[CPPR][node] & typex)
+ if (E->node[node] & typex)
U[E->id[node].doff[1]] = E->sphere.cap[CPPR].VB[1][node];
- if (E->node[CPPR][node] & typey)
+ if (E->node[node] & typey)
U[E->id[node].doff[2]] = E->sphere.cap[CPPR].VB[2][node];
- if (E->node[CPPR][node] & typez)
+ if (E->node[node] & typez)
U[E->id[node].doff[3]] = E->sphere.cap[CPPR].VB[3][node];
}
}
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index e7c19a1..829657a 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -1018,7 +1018,7 @@ void get_elt_f(E,el,elt_f,bcs)
type=vbc_flag[j];
for(b=1;b<=ends;b++) {
nodeb=E->ien[el].node[b];
- if ((E->node[CPPR][nodeb]&type)&&(E->sphere.cap[CPPR].VB[j][nodeb]!=0.0)){
+ if ((E->node[nodeb]&type)&&(E->sphere.cap[CPPR].VB[j][nodeb]!=0.0)){
if(!got_elt_k) {
get_elt_k(E,el,elt_k,E->mesh.levmax,1);
got_elt_k = 1;
@@ -1072,7 +1072,7 @@ static void get_elt_tr(struct All_variables *E, int bel, int side, double elt_tr
nodea = E->ien[el].node[ sidenodes[side][a] ];
for(d=1;d<=dims;d++) {
value = E->sbc.SB[CPPR][side][d][ E->sbc.node[CPPR][nodea] ];
- flagged = (E->node[CPPR][nodea] & sbc_flag[d]) && (value);
+ flagged = (E->node[nodea] & sbc_flag[d]) && (value);
found |= flagged;
traction[d][a] = ( flagged ? value : 0.0 );
}
@@ -1084,7 +1084,7 @@ static void get_elt_tr(struct All_variables *E, int bel, int side, double elt_tr
nodea = E->ien[el].node[ sidenodes[side][a] ];
for(d=1;d<=dims;d++) {
value = E->sphere.cap[CPPR].VB[d][nodea];
- flagged = (E->node[CPPR][nodea] & sbc_flag[d]) && (value);
+ flagged = (E->node[nodea] & sbc_flag[d]) && (value);
found |= flagged;
traction[d][a] = ( flagged ? value : 0.0 );
}
@@ -1154,7 +1154,7 @@ static void get_elt_tr_pseudo_surf(struct All_variables *E, int bel, int side, d
nodea = E->ien[el].node[ sidenodes[side][a] ];
for(d=1;d<=dims;d++) {
value = E->sbc.SB[CPPR][side][d][ E->sbc.node[CPPR][nodea] ];
- flagged = (E->node[CPPR][nodea] & sbc_flag[d]) && (value);
+ flagged = (E->node[nodea] & sbc_flag[d]) && (value);
found |= flagged;
traction[d][a] = ( flagged ? value : 0.0 );
}
@@ -1186,7 +1186,7 @@ static void get_elt_tr_pseudo_surf(struct All_variables *E, int bel, int side, d
nodea = E->ien[el].node[ sidenodes[side][a] ];
for(d=1;d<=dims;d++) {
value = E->sphere.cap[CPPR].VB[d][nodea];
- flagged = (E->node[CPPR][nodea] & sbc_flag[d]) && (value);
+ flagged = (E->node[nodea] & sbc_flag[d]) && (value);
found |= flagged;
traction[d][a] = ( flagged ? value : 0.0 );
}
diff --git a/lib/Instructions.c b/lib/Instructions.c
index b0e7314..a29a092 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1319,17 +1319,17 @@ void check_bc_consistency(E)
int i,j,lev;
for(i=1;i<=E->lmesh.nno;i++) {
- if ((E->node[CPPR][i] & VBX) && (E->node[CPPR][i] & SBX))
+ if ((E->node[i] & VBX) && (E->node[i] & SBX))
printf("Inconsistent x velocity bc at %d\n",i);
- if ((E->node[CPPR][i] & VBZ) && (E->node[CPPR][i] & SBZ))
+ if ((E->node[i] & VBZ) && (E->node[i] & SBZ))
printf("Inconsistent z velocity bc at %d\n",i);
- if ((E->node[CPPR][i] & VBY) && (E->node[CPPR][i] & SBY))
+ if ((E->node[i] & VBY) && (E->node[i] & SBY))
printf("Inconsistent y velocity bc at %d\n",i);
- if ((E->node[CPPR][i] & TBX) && (E->node[CPPR][i] & FBX))
+ if ((E->node[i] & TBX) && (E->node[i] & FBX))
printf("Inconsistent x temperature bc at %d\n",i);
- if ((E->node[CPPR][i] & TBZ) && (E->node[CPPR][i] & FBZ))
+ if ((E->node[i] & TBZ) && (E->node[i] & FBZ))
printf("Inconsistent z temperature bc at %d\n",i);
- if ((E->node[CPPR][i] & TBY) && (E->node[CPPR][i] & FBY))
+ if ((E->node[i] & TBY) && (E->node[i] & FBY))
printf("Inconsistent y temperature bc at %d\n",i);
}
@@ -1356,7 +1356,7 @@ void set_up_nonmg_aliases(struct All_variables *E)
E->id = E->ID[E->mesh.levmax][CPPR];
E->Vi = E->VI[E->mesh.levmax];
E->EVi = E->EVI[E->mesh.levmax];
- E->node[CPPR] = E->NODE[E->mesh.levmax][CPPR];
+ E->node = E->NODE[E->mesh.levmax][CPPR];
E->cc = E->CC[E->mesh.levmax][CPPR];
E->ccx = E->CCX[E->mesh.levmax][CPPR];
E->Mass = E->MASS[E->mesh.levmax];
diff --git a/lib/Lith_age.c b/lib/Lith_age.c
index 671c8ae..82fb27a 100644
--- a/lib/Lith_age.c
+++ b/lib/Lith_age.c
@@ -199,34 +199,34 @@ all three get set to true. CPC 6/20/00 */
if( ((E->sx[1][node]<=ttt2) && (E->sx[3][node]>=E->sphere.ro-E->control.depth_bound_adj)) || ((E->sx[1][node]>=ttt3) && (E->sx[3][node]>=E->sphere.ro-E->control.depth_bound_adj)) )
/* if < (width) from x bounds AND (depth) from top */
{
- E->node[CPPR][node]=E->node[CPPR][node] | TBX;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBX);
- E->node[CPPR][node]=E->node[CPPR][node] | TBY;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBY);
- E->node[CPPR][node]=E->node[CPPR][node] | TBZ;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBZ);
+ E->node[node]=E->node[node] | TBX;
+ E->node[node]=E->node[node] & (~FBX);
+ E->node[node]=E->node[node] | TBY;
+ E->node[node]=E->node[node] & (~FBY);
+ E->node[node]=E->node[node] | TBZ;
+ E->node[node]=E->node[node] & (~FBZ);
}
if( ((E->sx[2][node]<=fff2) && (E->sx[3][node]>=E->sphere.ro-E->control.depth_bound_adj)) )
/* if fi is < (width) from side AND z is < (depth) from top */
{
- E->node[CPPR][node]=E->node[CPPR][node] | TBX;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBX);
- E->node[CPPR][node]=E->node[CPPR][node] | TBY;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBY);
- E->node[CPPR][node]=E->node[CPPR][node] | TBZ;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBZ);
+ E->node[node]=E->node[node] | TBX;
+ E->node[node]=E->node[node] & (~FBX);
+ E->node[node]=E->node[node] | TBY;
+ E->node[node]=E->node[node] & (~FBY);
+ E->node[node]=E->node[node] | TBZ;
+ E->node[node]=E->node[node] & (~FBZ);
}
if( ((E->sx[2][node]>=fff3) && (E->sx[3][node]>=E->sphere.ro-E->control.depth_bound_adj)) )
/* if fi is < (width) from side AND z is < (depth) from top */
{
- E->node[CPPR][node]=E->node[CPPR][node] | TBX;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBX);
- E->node[CPPR][node]=E->node[CPPR][node] | TBY;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBY);
- E->node[CPPR][node]=E->node[CPPR][node] | TBZ;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBZ);
+ E->node[node]=E->node[node] | TBX;
+ E->node[node]=E->node[node] & (~FBX);
+ E->node[node]=E->node[node] | TBY;
+ E->node[node]=E->node[node] & (~FBY);
+ E->node[node]=E->node[node] | TBZ;
+ E->node[node]=E->node[node] & (~FBZ);
}
}
@@ -237,12 +237,12 @@ all three get set to true. CPC 6/20/00 */
for(node=1;node<=E->lmesh.nno;node++) {
if(E->sx[3][node]>=E->sphere.ro-E->control.lith_age_depth)
{ /* if closer than (lith_age_depth) from top */
- E->node[CPPR][node]=E->node[CPPR][node] | TBX;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBX);
- E->node[CPPR][node]=E->node[CPPR][node] | TBY;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBY);
- E->node[CPPR][node]=E->node[CPPR][node] | TBZ;
- E->node[CPPR][node]=E->node[CPPR][node] & (~FBZ);
+ E->node[node]=E->node[node] | TBX;
+ E->node[node]=E->node[node] & (~FBX);
+ E->node[node]=E->node[node] | TBY;
+ E->node[node]=E->node[node] & (~FBY);
+ E->node[node]=E->node[node] | TBZ;
+ E->node[node]=E->node[node] & (~FBZ);
}
}
@@ -380,7 +380,7 @@ void assimilate_lith_conform_bcs(struct All_variables *E)
for(node=1;node<=E->lmesh.nno;node++) {
- type = (E->node[CPPR][node] & (TBX | TBZ | TBY));
+ type = (E->node[node] & (TBX | TBZ | TBY));
switch (type) {
case 0: /* no match, next node */
diff --git a/lib/Nodal_mesh.c b/lib/Nodal_mesh.c
index b244552..0519faf 100644
--- a/lib/Nodal_mesh.c
+++ b/lib/Nodal_mesh.c
@@ -46,11 +46,11 @@ void v_from_vector(E)
E->sphere.cap[CPPR].V[1][node] = E->U[E->id[node].doff[1]];
E->sphere.cap[CPPR].V[2][node] = E->U[E->id[node].doff[2]];
E->sphere.cap[CPPR].V[3][node] = E->U[E->id[node].doff[3]];
- if (E->node[CPPR][node] & VBX)
+ if (E->node[node] & VBX)
E->sphere.cap[CPPR].V[1][node] = E->sphere.cap[CPPR].VB[1][node];
- if (E->node[CPPR][node] & VBY)
+ if (E->node[node] & VBY)
E->sphere.cap[CPPR].V[2][node] = E->sphere.cap[CPPR].VB[2][node];
- if (E->node[CPPR][node] & VBZ)
+ if (E->node[node] & VBZ)
E->sphere.cap[CPPR].V[3][node] = E->sphere.cap[CPPR].VB[3][node];
}
}
@@ -85,11 +85,11 @@ void v_from_vector_pseudo_surf(E)
E->sphere.cap[CPPR].V[1][node] = E->U[E->id[node].doff[1]];
E->sphere.cap[CPPR].V[2][node] = E->U[E->id[node].doff[2]];
E->sphere.cap[CPPR].V[3][node] = E->U[E->id[node].doff[3]];
- if (E->node[CPPR][node] & VBX)
+ if (E->node[node] & VBX)
E->sphere.cap[CPPR].V[1][node] = E->sphere.cap[CPPR].VB[1][node];
- if (E->node[CPPR][node] & VBY)
+ if (E->node[node] & VBY)
E->sphere.cap[CPPR].V[2][node] = E->sphere.cap[CPPR].VB[2][node];
- if (E->node[CPPR][node] & VBZ)
+ if (E->node[node] & VBZ)
E->sphere.cap[CPPR].V[3][node] = E->sphere.cap[CPPR].VB[3][node];
sum_dV += (E->sphere.cap[CPPR].V[1][node] - E->sphere.cap[CPPR].Vprev[1][node])*(E->sphere.cap[CPPR].V[1][node] - E->sphere.cap[CPPR].Vprev[1][node])
diff --git a/lib/Pan_problem_misc_functions.c b/lib/Pan_problem_misc_functions.c
index 34b8f9d..207b351 100644
--- a/lib/Pan_problem_misc_functions.c
+++ b/lib/Pan_problem_misc_functions.c
@@ -119,7 +119,7 @@ void apply_side_sbc(struct All_variables *E)
n = 1;
for(i=1; i<=E->lmesh.nno; i++) {
- if(E->node[CPPR][i] & sbc_flags) {
+ if(E->node[i] & sbc_flags) {
E->sbc.node[CPPR][i] = n;
n++;
}
@@ -138,7 +138,7 @@ void apply_side_sbc(struct All_variables *E)
for(d=1; d<=E->mesh.nsd; d++)
for(i=1; i<=E->lmesh.nno; i++)
- if(E->node[CPPR][i] & sbc_flag[d] && E->sphere.cap[CPPR].VB[d][i] != 0) {
+ if(E->node[i] & sbc_flag[d] && E->sphere.cap[CPPR].VB[d][i] != 0) {
j = E->sbc.node[CPPR][i];
for(side=SIDE_BOTTOM; side<=SIDE_TOP; side++)
E->sbc.SB[CPPR][side][d][j] = E->sphere.cap[CPPR].VB[d][i];
@@ -256,7 +256,7 @@ static int scan_double_vector(const char *str, int len, double *values)
/** debug **
for (i = 0; i < len; ++i) fprintf(stderr, "%e, ", values[i]);
fprintf(stderr, "\n");
- /**/
+ */
return len;
}
diff --git a/lib/Regional_boundary_conditions.c b/lib/Regional_boundary_conditions.c
index 41fb777..802a9b7 100644
--- a/lib/Regional_boundary_conditions.c
+++ b/lib/Regional_boundary_conditions.c
@@ -140,7 +140,7 @@ void regional_velocity_boundary_conditions(E)
if(E->control.verbose) {
for (node=1;node<=E->lmesh.nno;node++)
- fprintf(E->fp_out,"m=%d VB== %d %g %g %g flag %u %u %u\n",CPPR,node,E->sphere.cap[CPPR].VB[1][node],E->sphere.cap[CPPR].VB[2][node],E->sphere.cap[CPPR].VB[3][node],E->node[CPPR][node]&VBX,E->node[CPPR][node]&VBY,E->node[CPPR][node]&VBZ);
+ fprintf(E->fp_out,"m=%d VB== %d %g %g %g flag %u %u %u\n",CPPR,node,E->sphere.cap[CPPR].VB[1][node],E->sphere.cap[CPPR].VB[2][node],E->sphere.cap[CPPR].VB[3][node],E->node[node]&VBX,E->node[node]&VBY,E->node[node]&VBZ);
fflush(E->fp_out);
}
/* If any imposed internal velocity structure it goes here */
@@ -350,13 +350,13 @@ static void temperature_refl_vert_bc(E)
node1 = i + (j-1)*E->lmesh.noz*E->lmesh.nox;
node2 = node1 + (E->lmesh.nox-1)*E->lmesh.noz;
if (E->parallel.me_loc[1]==0 ) {
- E->node[CPPR][node1] = E->node[CPPR][node1] & (~TBX);
- E->node[CPPR][node1] = E->node[CPPR][node1] | FBX;
+ E->node[node1] = E->node[node1] & (~TBX);
+ E->node[node1] = E->node[node1] | FBX;
E->sphere.cap[CPPR].TB[1][node1] = 0.0;
}
if (E->parallel.me_loc[1]==E->parallel.nprocx-1) {
- E->node[CPPR][node2] = E->node[CPPR][node2] & (~TBX);
- E->node[CPPR][node2] = E->node[CPPR][node2] | FBX;
+ E->node[node2] = E->node[node2] & (~TBX);
+ E->node[node2] = E->node[node2] | FBX;
E->sphere.cap[CPPR].TB[1][node2] = 0.0;
}
} /* end for loop i & j */
@@ -365,8 +365,8 @@ static void temperature_refl_vert_bc(E)
for(j=1;j<=E->lmesh.nox;j++)
for(i=1;i<=E->lmesh.noz;i++) {
node1 = i + (j-1)*E->lmesh.noz;
- E->node[CPPR][node1] = E->node[CPPR][node1] & (~TBY);
- E->node[CPPR][node1] = E->node[CPPR][node1] | FBY;
+ E->node[node1] = E->node[node1] & (~TBY);
+ E->node[node1] = E->node[node1] | FBY;
E->sphere.cap[CPPR].TB[2][node1] = 0.0;
}
@@ -374,8 +374,8 @@ static void temperature_refl_vert_bc(E)
for(j=1;j<=E->lmesh.nox;j++)
for(i=1;i<=E->lmesh.noz;i++) {
node2 = i +(j-1)*E->lmesh.noz + (E->lmesh.noy-1)*E->lmesh.noz*E->lmesh.nox;
- E->node[CPPR][node2] = E->node[CPPR][node2] & (~TBY);
- E->node[CPPR][node2] = E->node[CPPR][node2] | FBY;
+ E->node[node2] = E->node[node2] & (~TBY);
+ E->node[node2] = E->node[node2] | FBY;
E->sphere.cap[CPPR].TB[2][node2] = 0.0;
} /* end loop for i and j */
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 0f17ae8..7194393 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -460,7 +460,7 @@ void stress_conform_bcs(struct All_variables *E)
for(d=1; d<=E->mesh.nsd; d++)
- if(E->node[CPPR][n] & sbc_flag[d]) {
+ if(E->node[n] & sbc_flag[d]) {
if(i==1)
E->gstress[CPPR][(n-1)*6+stress_index[d][2]] = E->sbc.SB[CPPR][SIDE_WEST][d][ E->sbc.node[CPPR][n] ];
if(i==E->lmesh.noy)
@@ -488,7 +488,7 @@ void stress_conform_bcs(struct All_variables *E)
for(k=1; k<=E->lmesh.noz; k++) {
n = k+(j-1)*E->lmesh.noz+(i-1)*noxnoz;
for(d=1; d<=E->mesh.nsd; d++)
- if(E->node[CPPR][n] & sbc_flag[d]) {
+ if(E->node[n] & sbc_flag[d]) {
/* apply internal traction vector on horizontal surface */
E->gstress[CPPR][(n-1)*6+stress_index[d][3]] = E->sphere.cap[CPPR].VB[d][n];
}
@@ -500,7 +500,7 @@ void stress_conform_bcs(struct All_variables *E)
for(k=1; k<=E->lmesh.noz; k++) {
n = k+(j-1)*E->lmesh.noz+(i-1)*noxnoz;
for(d=1; d<=E->mesh.nsd; d++)
- if(E->node[CPPR][n] & sbc_flag[d]) {
+ if(E->node[n] & sbc_flag[d]) {
if(i==1 || i==E->lmesh.noy)
E->gstress[CPPR][(n-1)*6+stress_index[d][2]] = E->sphere.cap[CPPR].VB[d][n];
if(j==1 || j==E->lmesh.nox)
diff --git a/lib/global_defs.h b/lib/global_defs.h
index f7769a3..f5b44e8 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -864,7 +864,7 @@ struct All_variables {
int *mat[NCS];
float *VIP[NCS];
unsigned int *NODE[MAX_LEVELS][NCS];
- unsigned int *node[NCS];
+ unsigned int *node;
float *age_t;
More information about the CIG-COMMITS
mailing list