[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->parallel.EXCHANGE_NODE as part of caps_per_proc_removal (c1f3930)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:12:57 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit c1f393091202e486fd2531e49faf9606dfdcf631
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 11:13:33 2014 -0700
Changed the shape of E->parallel.EXCHANGE_NODE as part of caps_per_proc_removal
>---------------------------------------------------------------
c1f393091202e486fd2531e49faf9606dfdcf631
lib/Full_parallel_related.c | 32 ++++++++++++++++----------------
lib/Instructions.c | 2 +-
lib/Regional_parallel_related.c | 14 +++++++-------
lib/global_defs.h | 2 +-
4 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/lib/Full_parallel_related.c b/lib/Full_parallel_related.c
index 836760b..f6ae772 100644
--- a/lib/Full_parallel_related.c
+++ b/lib/Full_parallel_related.c
@@ -682,7 +682,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];
- E->parallel.EXCHANGE_NODE[lev][CPPR][++kk].pass[kkkp] = node;
+ E->parallel.EXCHANGE_NODE[lev][++kk].pass[kkkp] = node;
for(doff=1;doff<=dims;doff++)
E->parallel.EXCHANGE_ID[lev][++jj].pass[kkkp] =
E->ID[lev][node].doff[doff];
@@ -711,7 +711,7 @@ void full_parallel_communication_routs_v(E)
fprintf(E->fp_out,"%d %d\n",ii,E->parallel.EXCHANGE_ID[lev][ii].pass[k]);
fprintf(E->fp_out,"Node:\n");
for (ii=1;ii<=E->parallel.NUM_NODE[lev].pass[k];ii++)
- fprintf(E->fp_out,"%d %d\n",ii,E->parallel.EXCHANGE_NODE[lev][CPPR][ii].pass[k]);
+ fprintf(E->fp_out,"%d %d\n",ii,E->parallel.EXCHANGE_NODE[lev][ii].pass[k]);
}
fprintf(E->fp_out,"output_communication route vertical \n");
@@ -723,7 +723,7 @@ void full_parallel_communication_routs_v(E)
for (ii=1;ii<=E->parallel.NUM_NEQ[lev].pass[kkkp];ii++)
fprintf(E->fp_out,"%d %d\n",ii,E->parallel.EXCHANGE_ID[lev][ii].pass[kkkp]);
for (ii=1;ii<=E->parallel.NUM_NODE[lev].pass[kkkp];ii++)
- fprintf(E->fp_out,"%d %d\n",ii,E->parallel.EXCHANGE_NODE[lev][CPPR][ii].pass[kkkp]);
+ fprintf(E->fp_out,"%d %d\n",ii,E->parallel.EXCHANGE_NODE[lev][ii].pass[kkkp]);
}
}
fflush(E->fp_out);
@@ -776,7 +776,7 @@ void full_parallel_communication_routs_s(E)
E->parallel.NUM_sNODE[lev][CPPR].pass[kkk]=1;
for (k=1;k<=E->parallel.NUM_sNODE[lev][CPPR].pass[kkk];k++) {
- node = E->parallel.EXCHANGE_NODE[lev][CPPR][k].pass[kkk]/noz + 1;
+ node = E->parallel.EXCHANGE_NODE[lev][k].pass[kkk]/noz + 1;
E->parallel.EXCHANGE_sNODE[lev][CPPR][k].pass[kkk] = node;
} /* end for node k */
} /* end for the last FOUR communications */
@@ -820,7 +820,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];
- E->parallel.EXCHANGE_NODE[lev][CPPR][kk].pass[npass] = node;
+ 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];
}
@@ -843,7 +843,7 @@ static void line_eqn_node_to_pass(E,lev,npass,num_node,offset,stride)
jj=0;
for (kk=1;kk<=E->parallel.NUM_NODE[lev].pass[npass];kk++) {
node = (kk-1)*stride + offset;
- E->parallel.EXCHANGE_NODE[lev][CPPR][kk].pass[npass] = node;
+ 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];
}
@@ -989,7 +989,7 @@ static void exchange_node_d(E, U, lev)
kk=k;
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[k];j++)
- S[kk][j-1] = U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[k] ];
+ S[kk][j-1] = U[ E->parallel.EXCHANGE_NODE[lev][j].pass[k] ];
if (E->parallel.PROCESSOR[lev].pass[k]!=E->parallel.me) {
if (E->parallel.PROCESSOR[lev].pass[k]!=-1) {
@@ -1014,7 +1014,7 @@ static void exchange_node_d(E, U, lev)
else {
kk=k;
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[k];j++)
- U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[k] ] += S[kk][j-1];
+ U[ E->parallel.EXCHANGE_NODE[lev][j].pass[k] ] += S[kk][j-1];
}
} /* for k */
@@ -1026,7 +1026,7 @@ static void exchange_node_d(E, U, lev)
if (E->parallel.PROCESSOR[lev].pass[k]!=E->parallel.me)
if (E->parallel.PROCESSOR[lev].pass[k]!=-1) {
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[k];j++)
- U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[k] ] += R[kk][j-1];
+ U[ E->parallel.EXCHANGE_NODE[lev][j].pass[k] ] += R[kk][j-1];
}
}
@@ -1037,7 +1037,7 @@ static void exchange_node_d(E, U, lev)
kk = k + E->sphere.max_connections;
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[kk];j++)
- SV[jj++] = U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[kk] ];
+ SV[jj++] = U[ E->parallel.EXCHANGE_NODE[lev][j].pass[kk] ];
MPI_Sendrecv(SV,E->parallel.NUM_NODEz[lev].pass[k],MPI_DOUBLE,
E->parallel.PROCESSORz[lev].pass[k],1,
@@ -1046,7 +1046,7 @@ static void exchange_node_d(E, U, lev)
jj = 0;
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[kk];j++)
- U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[kk] ] += RV[jj++];
+ U[ E->parallel.EXCHANGE_NODE[lev][j].pass[kk] ] += RV[jj++];
}
kk = 0;
@@ -1100,7 +1100,7 @@ static void exchange_node_f(E, U, lev)
kk=k;
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[k];j++)
- S[kk][j-1] = U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[k] ];
+ S[kk][j-1] = U[ E->parallel.EXCHANGE_NODE[lev][j].pass[k] ];
if (E->parallel.PROCESSOR[lev].pass[k]!=E->parallel.me) {
if (E->parallel.PROCESSOR[lev].pass[k]!=-1) {
@@ -1125,7 +1125,7 @@ static void exchange_node_f(E, U, lev)
else {
kk=k;
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[k];j++)
- U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[k] ] += S[kk][j-1];
+ U[ E->parallel.EXCHANGE_NODE[lev][j].pass[k] ] += S[kk][j-1];
}
} /* for k */
@@ -1137,7 +1137,7 @@ static void exchange_node_f(E, U, lev)
if (E->parallel.PROCESSOR[lev].pass[k]!=E->parallel.me)
if (E->parallel.PROCESSOR[lev].pass[k]!=-1) {
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[k];j++)
- U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[k] ] += R[kk][j-1];
+ U[ E->parallel.EXCHANGE_NODE[lev][j].pass[k] ] += R[kk][j-1];
}
}
@@ -1148,7 +1148,7 @@ static void exchange_node_f(E, U, lev)
kk = k + E->sphere.max_connections;
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[kk];j++)
- SV[jj++] = U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[kk] ];
+ SV[jj++] = U[ E->parallel.EXCHANGE_NODE[lev][j].pass[kk] ];
MPI_Sendrecv(SV,E->parallel.NUM_NODEz[lev].pass[k],MPI_FLOAT,
E->parallel.PROCESSORz[lev].pass[k],1,
@@ -1157,7 +1157,7 @@ static void exchange_node_f(E, U, lev)
jj = 0;
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[kk];j++)
- U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[kk] ] += RV[jj++];
+ U[ E->parallel.EXCHANGE_NODE[lev][j].pass[kk] ] += RV[jj++];
}
kk = 0;
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 5643db7..2c9e3ae 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1085,7 +1085,7 @@ void allocate_common_vars(E)
E->parallel.EXCHANGE_sNODE[i][CPPR] = (struct PASS *) malloc((nozl+2)*sizeof(struct PASS));
E->parallel.NODE[i][CPPR] = (struct BOUND *) malloc((nxyz+2)*sizeof(struct BOUND));
- E->parallel.EXCHANGE_NODE[i][CPPR]= (struct PASS *) malloc((nxyz+2)*sizeof(struct PASS));
+ 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));
for(l=1;l<=E->lmesh.NNO[i];l++) {
diff --git a/lib/Regional_parallel_related.c b/lib/Regional_parallel_related.c
index 3282dc9..9d6b6e6 100644
--- a/lib/Regional_parallel_related.c
+++ b/lib/Regional_parallel_related.c
@@ -483,7 +483,7 @@ void regional_parallel_communication_routs_v(E)
for (k=1;k<=E->parallel.NUM_NODE[lev].pass[kkk];k++) {
lnode = k;
node = E->parallel.NODE[lev][CPPR][lnode].bound[ii];
- E->parallel.EXCHANGE_NODE[lev][CPPR][k].pass[kkk] = node;
+ E->parallel.EXCHANGE_NODE[lev][k].pass[kkk] = node;
temp_dims = dims;
for(doff=1;doff<=temp_dims;doff++)
@@ -519,7 +519,7 @@ void regional_parallel_communication_routs_v(E)
for (kk=1;kk<=E->parallel.NUM_NODE[lev].pass[kkk];kk++) {
lnode = kk;
node = E->parallel.NODE[lev][CPPR][lnode].bound[ii];
- E->parallel.EXCHANGE_NODE[lev][CPPR][kk].pass[kkk] = node;
+ E->parallel.EXCHANGE_NODE[lev][kk].pass[kkk] = node;
temp_dims = dims;
for(doff=1;doff<=temp_dims;doff++)
E->parallel.EXCHANGE_ID[lev][++jj].pass[kkk] = E->ID[lev][node].doff[doff];
@@ -554,7 +554,7 @@ void regional_parallel_communication_routs_v(E)
for (kk=1;kk<=E->parallel.NUM_NODE[lev].pass[kkk];kk++) {
lnode = kk;
node = E->parallel.NODE[lev][CPPR][lnode].bound[ii];
- E->parallel.EXCHANGE_NODE[lev][CPPR][kk].pass[kkk] = node;
+ E->parallel.EXCHANGE_NODE[lev][kk].pass[kkk] = node;
temp_dims = dims;
for(doff=1;doff<=temp_dims;doff++)
E->parallel.EXCHANGE_ID[lev][++jj].pass[kkk] = E->ID[lev][node].doff[doff];
@@ -761,7 +761,7 @@ static void exchange_node_d(E, U, lev)
for (k=1;k<=E->parallel.TNUM_PASS[lev];k++) {
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[k];j++)
- S[k][j-1] = U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[k] ];
+ S[k][j-1] = U[ E->parallel.EXCHANGE_NODE[lev][j].pass[k] ];
MPI_Sendrecv(S[k],E->parallel.NUM_NODE[lev].pass[k],MPI_DOUBLE,
E->parallel.PROCESSOR[lev].pass[k],1,
@@ -770,7 +770,7 @@ static void exchange_node_d(E, U, lev)
E->parallel.world,&status);
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[k];j++)
- U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[k] ] += R[k][j-1];
+ U[ E->parallel.EXCHANGE_NODE[lev][j].pass[k] ] += R[k][j-1];
}
for (k=1;k<=E->parallel.TNUM_PASS[lev];k++) {
@@ -804,7 +804,7 @@ static void exchange_node_f(E, U, lev)
for (k=1;k<=E->parallel.TNUM_PASS[lev];k++) {
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[k];j++)
- S[k][j-1] = U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[k] ];
+ S[k][j-1] = U[ E->parallel.EXCHANGE_NODE[lev][j].pass[k] ];
MPI_Sendrecv(S[k],E->parallel.NUM_NODE[lev].pass[k],MPI_FLOAT,
E->parallel.PROCESSOR[lev].pass[k],1,
@@ -813,7 +813,7 @@ static void exchange_node_f(E, U, lev)
E->parallel.world,&status);
for (j=1;j<=E->parallel.NUM_NODE[lev].pass[k];j++)
- U[ E->parallel.EXCHANGE_NODE[lev][CPPR][j].pass[k] ] += R[k][j-1];
+ U[ E->parallel.EXCHANGE_NODE[lev][j].pass[k] ] += R[k][j-1];
}
for (k=1;k<=E->parallel.TNUM_PASS[lev];k++) {
diff --git a/lib/global_defs.h b/lib/global_defs.h
index cfb20af..bd616ab 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -243,7 +243,7 @@ struct Parallel {
struct PASS NUM_NODE[MAX_LEVELS];
struct PASS PROCESSOR[MAX_LEVELS];
struct PASS *EXCHANGE_ID[MAX_LEVELS];
- struct PASS *EXCHANGE_NODE[MAX_LEVELS][NCS];
+ struct PASS *EXCHANGE_NODE[MAX_LEVELS];
int TNUM_PASSz[MAX_LEVELS];
struct BOUND NUM_PASSz[MAX_LEVELS];
More information about the CIG-COMMITS
mailing list