[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->parallel.NODE as part of caps_per_proc_removal (6539598)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:13:07 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 6539598e9279d91b7a043ed71d018eb54439ac0c
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 11:37:48 2014 -0700
Changed the shape of E->parallel.NODE as part of caps_per_proc_removal
>---------------------------------------------------------------
6539598e9279d91b7a043ed71d018eb54439ac0c
lib/Construct_arrays.c | 4 ++--
lib/Full_parallel_related.c | 26 +++++++++++++-------------
lib/Instructions.c | 2 +-
lib/Regional_parallel_related.c | 30 +++++++++++++++---------------
lib/global_defs.h | 2 +-
5 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index cbbdb99..fe3e6ef 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -525,12 +525,12 @@ void construct_masks(E) /* Add lid/edge masks/nodal weightings */
if (E->parallel.me_loc[3]==0 )
for (i=1;i<=E->parallel.NUM_NNO[lev].bound[5];i++) {
- node = E->parallel.NODE[lev][CPPR][i].bound[5];
+ node = E->parallel.NODE[lev][i].bound[5];
E->NODE[lev][node] = E->NODE[lev][node] | TZEDGE;
}
if ( E->parallel.me_loc[3]==E->parallel.nprocz-1 )
for (i=1;i<=E->parallel.NUM_NNO[lev].bound[6];i++) {
- node = E->parallel.NODE[lev][CPPR][i].bound[6];
+ node = E->parallel.NODE[lev][i].bound[6];
E->NODE[lev][node] = E->NODE[lev][node] | TZEDGE;
}
}
diff --git a/lib/Full_parallel_related.c b/lib/Full_parallel_related.c
index 914954c..043268a 100644
--- a/lib/Full_parallel_related.c
+++ b/lib/Full_parallel_related.c
@@ -349,7 +349,7 @@ void full_parallel_domain_boundary_nodes(E)
for(j=1;j<=noz;j++)
for(k=1;k<=noy;k++) {
node = j + (k-1)*noz*nox;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -361,7 +361,7 @@ void full_parallel_domain_boundary_nodes(E)
for(j=1;j<=noz;j++)
for(k=1;k<=noy;k++) {
node = (nox-1)*noz + j + (k-1)*noz*nox;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -374,7 +374,7 @@ void full_parallel_domain_boundary_nodes(E)
for(k=1;k<=noy;k++)
for(i=1;i<=nox;i++) {
node = (k-1)*nox*noz + (i-1)*noz + 1;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -385,7 +385,7 @@ void full_parallel_domain_boundary_nodes(E)
for(k=1;k<=noy;k++)
for(i=1;i<=nox;i++) {
node = (k-1)*nox*noz + i*noz;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -398,7 +398,7 @@ void full_parallel_domain_boundary_nodes(E)
for(j=1;j<=noz;j++)
for(i=1;i<=nox;i++) {
node = (i-1)*noz +j;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -409,7 +409,7 @@ void full_parallel_domain_boundary_nodes(E)
for(j=1;j<=noz;j++)
for(i=1;i<=nox;i++) {
node = noz*nox*(noy-1) + (i-1)*noz +j;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -421,12 +421,12 @@ void full_parallel_domain_boundary_nodes(E)
all nodes at right (ix==nox) and front (iy==1) faces
are skipped */
for (lnode=1;lnode<=E->parallel.NUM_NNO[lev].bound[2];lnode++) {
- node = E->parallel.NODE[lev][CPPR][lnode].bound[2];
+ node = E->parallel.NODE[lev][lnode].bound[2];
E->NODE[lev][node] = E->NODE[lev][node] | SKIP;
}
for (lnode=1;lnode<=E->parallel.NUM_NNO[lev].bound[3];lnode++) {
- node = E->parallel.NODE[lev][CPPR][lnode].bound[3];
+ node = E->parallel.NODE[lev][lnode].bound[3];
E->NODE[lev][node] = E->NODE[lev][node] | SKIP;
}
@@ -455,7 +455,7 @@ void full_parallel_domain_boundary_nodes(E)
all top nodes except those at top processors are skipped */
if (E->parallel.me_loc[3]!=E->parallel.nprocz-1 )
for (lnode=1;lnode<=E->parallel.NUM_NNO[lev].bound[6];lnode++) {
- node = E->parallel.NODE[lev][CPPR][lnode].bound[6];
+ node = E->parallel.NODE[lev][lnode].bound[6];
E->NODE[lev][node] = E->NODE[lev][node] | SKIP;
}
@@ -468,7 +468,7 @@ if (E->control.verbose) {
fprintf(E->fp_out,"lev=%d me=%d capid=%d m=%d \n",lev,E->parallel.me,E->sphere.capid[CPPR],CPPR);
for (ii=1;ii<=6;ii++)
for (i=1;i<=E->parallel.NUM_NNO[lev].bound[ii];i++)
- fprintf(E->fp_out,"ii=%d %d %d \n",ii,i,E->parallel.NODE[lev][CPPR][i].bound[ii]);
+ fprintf(E->fp_out,"ii=%d %d %d \n",ii,i,E->parallel.NODE[lev][i].bound[ii]);
lnode=0;
for (node=1;node<=E->lmesh.NNO[lev];node++)
@@ -681,7 +681,7 @@ void full_parallel_communication_routs_v(E)
jj=0; kk=0;
for (k=1;k<=E->parallel.NUM_NNO[lev].bound[ii];k++) {
- node = E->parallel.NODE[lev][CPPR][k].bound[ii];
+ node = E->parallel.NODE[lev][k].bound[ii];
E->parallel.EXCHANGE_NODE[lev][++kk].pass[kkkp] = node;
for(doff=1;doff<=dims;doff++)
E->parallel.EXCHANGE_ID[lev][++jj].pass[kkkp] =
@@ -767,7 +767,7 @@ void full_parallel_communication_routs_s(E)
for (k=1;k<=E->parallel.NUM_sNODE[lev].pass[kkk];k++) {
lnode = k;
- node = (E->parallel.NODE[lev][CPPR][lnode].bound[ii]-1)/noz + 1;
+ node = (E->parallel.NODE[lev][lnode].bound[ii]-1)/noz + 1;
E->parallel.EXCHANGE_sNODE[lev][k].pass[kkk] = node;
} /* end for node k */
} /* end for first 4 communications */
@@ -819,7 +819,7 @@ static void face_eqn_node_to_pass(E,lev,npass,bd)
jj = 0;
for (kk=1;kk<=E->parallel.NUM_NODE[lev].pass[npass];kk++) {
- node = E->parallel.NODE[lev][CPPR][kk].bound[bd];
+ node = E->parallel.NODE[lev][kk].bound[bd];
E->parallel.EXCHANGE_NODE[lev][kk].pass[npass] = node;
for(doff=1;doff<=dims;doff++)
E->parallel.EXCHANGE_ID[lev][++jj].pass[npass] = E->ID[lev][node].doff[doff];
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 512e2c3..6f2ca76 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1084,7 +1084,7 @@ void allocate_common_vars(E)
E->parallel.EXCHANGE_sNODE[i] = (struct PASS *) malloc((nozl+2)*sizeof(struct PASS));
- E->parallel.NODE[i][CPPR] = (struct BOUND *) malloc((nxyz+2)*sizeof(struct BOUND));
+ E->parallel.NODE[i] = (struct BOUND *) malloc((nxyz+2)*sizeof(struct BOUND));
E->parallel.EXCHANGE_NODE[i]= (struct PASS *) malloc((nxyz+2)*sizeof(struct PASS));
E->parallel.EXCHANGE_ID[i] = (struct PASS *) malloc((nxyz*E->mesh.nsd+3)*sizeof(struct PASS));
diff --git a/lib/Regional_parallel_related.c b/lib/Regional_parallel_related.c
index eec1d82..d929bd5 100644
--- a/lib/Regional_parallel_related.c
+++ b/lib/Regional_parallel_related.c
@@ -314,7 +314,7 @@ void regional_parallel_domain_boundary_nodes(E)
for(j=1;j<=noz;j++)
for(k=1;k<=noy;k++) {
node = j + (k-1)*noz*nox;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -326,7 +326,7 @@ void regional_parallel_domain_boundary_nodes(E)
for(j=1;j<=noz;j++)
for(k=1;k<=noy;k++) {
node = (nox-1)*noz + j + (k-1)*noz*nox;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -339,7 +339,7 @@ void regional_parallel_domain_boundary_nodes(E)
for(k=1;k<=noy;k++)
for(i=1;i<=nox;i++) {
node = (k-1)*nox*noz + (i-1)*noz + 1;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -350,7 +350,7 @@ void regional_parallel_domain_boundary_nodes(E)
for(k=1;k<=noy;k++)
for(i=1;i<=nox;i++) {
node = (k-1)*nox*noz + i*noz;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -363,7 +363,7 @@ void regional_parallel_domain_boundary_nodes(E)
for(j=1;j<=noz;j++)
for(i=1;i<=nox;i++) {
node = (i-1)*noz +j;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -374,7 +374,7 @@ void regional_parallel_domain_boundary_nodes(E)
for(j=1;j<=noz;j++)
for(i=1;i<=nox;i++) {
node = noz*nox*(noy-1) + (i-1)*noz +j;
- E->parallel.NODE[lev][CPPR][++lnode].bound[ii] = node;
+ E->parallel.NODE[lev][++lnode].bound[ii] = node;
E->NODE[lev][node] = E->NODE[lev][node] | OFFSIDE;
}
@@ -384,19 +384,19 @@ void regional_parallel_domain_boundary_nodes(E)
if (E->parallel.me_loc[1]!=E->parallel.nprocx-1)
for (lnode=1;lnode<=E->parallel.NUM_NNO[lev].bound[2];lnode++) {
- node = E->parallel.NODE[lev][CPPR][lnode].bound[2];
+ node = E->parallel.NODE[lev][lnode].bound[2];
E->NODE[lev][node] = E->NODE[lev][node] | SKIP;
}
if (E->parallel.me_loc[2]!=E->parallel.nprocy-1)
for (lnode=1;lnode<=E->parallel.NUM_NNO[lev].bound[4];lnode++) {
- node = E->parallel.NODE[lev][CPPR][lnode].bound[4];
+ node = E->parallel.NODE[lev][lnode].bound[4];
E->NODE[lev][node] = E->NODE[lev][node] | SKIP;
}
if (E->parallel.me_loc[3]!=E->parallel.nprocz-1)
for (lnode=1;lnode<=E->parallel.NUM_NNO[lev].bound[6];lnode++) {
- node = E->parallel.NODE[lev][CPPR][lnode].bound[6];
+ node = E->parallel.NODE[lev][lnode].bound[6];
E->NODE[lev][node] = E->NODE[lev][node] | SKIP;
}
@@ -409,7 +409,7 @@ if (E->control.verbose) {
fprintf(E->fp_out,"lev=%d me=%d capid=%d m=%d \n",lev,E->parallel.me,E->sphere.capid[CPPR],CPPR);
for (ii=1;ii<=6;ii++)
for (i=1;i<=E->parallel.NUM_NNO[lev].bound[ii];i++)
- fprintf(E->fp_out,"ii=%d %d %d \n",ii,i,E->parallel.NODE[lev][CPPR][i].bound[ii]);
+ fprintf(E->fp_out,"ii=%d %d %d \n",ii,i,E->parallel.NODE[lev][i].bound[ii]);
lnode=0;
for (node=1;node<=E->lmesh.NNO[lev];node++)
@@ -482,7 +482,7 @@ void regional_parallel_communication_routs_v(E)
jj = 0;
for (k=1;k<=E->parallel.NUM_NODE[lev].pass[kkk];k++) {
lnode = k;
- node = E->parallel.NODE[lev][CPPR][lnode].bound[ii];
+ node = E->parallel.NODE[lev][lnode].bound[ii];
E->parallel.EXCHANGE_NODE[lev][k].pass[kkk] = node;
temp_dims = dims;
@@ -518,7 +518,7 @@ void regional_parallel_communication_routs_v(E)
jj = 0; kf = 0;
for (kk=1;kk<=E->parallel.NUM_NODE[lev].pass[kkk];kk++) {
lnode = kk;
- node = E->parallel.NODE[lev][CPPR][lnode].bound[ii];
+ node = E->parallel.NODE[lev][lnode].bound[ii];
E->parallel.EXCHANGE_NODE[lev][kk].pass[kkk] = node;
temp_dims = dims;
for(doff=1;doff<=temp_dims;doff++)
@@ -553,7 +553,7 @@ void regional_parallel_communication_routs_v(E)
jj = 0; kf = 0;
for (kk=1;kk<=E->parallel.NUM_NODE[lev].pass[kkk];kk++) {
lnode = kk;
- node = E->parallel.NODE[lev][CPPR][lnode].bound[ii];
+ node = E->parallel.NODE[lev][lnode].bound[ii];
E->parallel.EXCHANGE_NODE[lev][kk].pass[kkk] = node;
temp_dims = dims;
for(doff=1;doff<=temp_dims;doff++)
@@ -648,7 +648,7 @@ void regional_parallel_communication_routs_s(E)
E->parallel.NUM_NNO[lev].bound[ii]/noz;
for (k=1;k<=E->parallel.NUM_sNODE[lev].pass[kkk];k++) {
lnode = k; /* due to lnode increases in horizontal di first */
- node = (E->parallel.NODE[lev][CPPR][lnode].bound[ii]-1)/noz+1;
+ node = (E->parallel.NODE[lev][lnode].bound[ii]-1)/noz+1;
E->parallel.EXCHANGE_sNODE[lev][k].pass[kkk] = node;
} /* end for node k */
@@ -677,7 +677,7 @@ void regional_parallel_communication_routs_s(E)
for (kk=1;kk<=E->parallel.NUM_sNODE[lev].pass[kkk];kk++) {
lnode = kk; /* due to lnode increases in horizontal di first */
- node = (E->parallel.NODE[lev][CPPR][lnode].bound[ii]-1)/noz+1;
+ node = (E->parallel.NODE[lev][lnode].bound[ii]-1)/noz+1;
E->parallel.EXCHANGE_sNODE[lev][kk].pass[kkk] = node;
} /* end for node kk */
diff --git a/lib/global_defs.h b/lib/global_defs.h
index cc72a4f..4f57784 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -236,7 +236,7 @@ struct Parallel {
int *Skip_id[MAX_LEVELS];
int TNUM_PASS[MAX_LEVELS];
- struct BOUND *NODE[MAX_LEVELS][NCS];
+ struct BOUND *NODE[MAX_LEVELS];
struct BOUND NUM_NNO[MAX_LEVELS];
struct BOUND NUM_PASS[MAX_LEVELS];
struct PASS NUM_NEQ[MAX_LEVELS];
More information about the CIG-COMMITS
mailing list