[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->parallel.NUM_NEQ as part of caps_per_proc_removal (a5bb652)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:12:48 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit a5bb652482693c38f879a38421531f692be67aab
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 10:53:42 2014 -0700
Changed the shape of E->parallel.NUM_NEQ as part of caps_per_proc_removal
>---------------------------------------------------------------
a5bb652482693c38f879a38421531f692be67aab
lib/Full_parallel_related.c | 30 +++++++++++++++---------------
lib/Regional_parallel_related.c | 18 +++++++++---------
lib/global_defs.h | 2 +-
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/lib/Full_parallel_related.c b/lib/Full_parallel_related.c
index 580d346..da20c61 100644
--- a/lib/Full_parallel_related.c
+++ b/lib/Full_parallel_related.c
@@ -688,7 +688,7 @@ void full_parallel_communication_routs_v(E)
E->ID[lev][node].doff[doff];
}
E->parallel.NUM_NODE[lev][CPPR].pass[kkkp] = kk;
- E->parallel.NUM_NEQ[lev][CPPR].pass[kkkp] = jj;
+ E->parallel.NUM_NEQ[lev].pass[kkkp] = jj;
E->parallel.NUM_NODEz[lev].pass[kkk] += kk;
E->parallel.NUM_NEQz[lev].pass[kkk] += jj;
@@ -705,9 +705,9 @@ void full_parallel_communication_routs_v(E)
fprintf(E->fp_out,"output_communication route surface for lev=%d \n",lev);
fprintf(E->fp_out," me= %d cap=%d pass %d \n",E->parallel.me,E->sphere.capid[CPPR],E->parallel.TNUM_PASS[lev]);
for (k=1;k<=E->parallel.TNUM_PASS[lev];k++) {
- fprintf(E->fp_out,"proc %d and pass %d to proc %d with %d eqn and %d node\n",E->parallel.me,k,E->parallel.PROCESSOR[lev][CPPR].pass[k],E->parallel.NUM_NEQ[lev][CPPR].pass[k],E->parallel.NUM_NODE[lev][CPPR].pass[k]);
+ fprintf(E->fp_out,"proc %d and pass %d to proc %d with %d eqn and %d node\n",E->parallel.me,k,E->parallel.PROCESSOR[lev][CPPR].pass[k],E->parallel.NUM_NEQ[lev].pass[k],E->parallel.NUM_NODE[lev][CPPR].pass[k]);
fprintf(E->fp_out,"Eqn:\n");
- for (ii=1;ii<=E->parallel.NUM_NEQ[lev][CPPR].pass[k];ii++)
+ for (ii=1;ii<=E->parallel.NUM_NEQ[lev].pass[k];ii++)
fprintf(E->fp_out,"%d %d\n",ii,E->parallel.EXCHANGE_ID[lev][CPPR][ii].pass[k]);
fprintf(E->fp_out,"Node:\n");
for (ii=1;ii<=E->parallel.NUM_NODE[lev][CPPR].pass[k];ii++)
@@ -719,8 +719,8 @@ void full_parallel_communication_routs_v(E)
for (k=1;k<=E->parallel.TNUM_PASSz[lev];k++) {
kkkp = k + E->sphere.max_connections;
fprintf(E->fp_out,"proc %d and pass %d to proc %d\n",E->parallel.me,k,E->parallel.PROCESSORz[lev].pass[k]);
- fprintf(E->fp_out,"cap=%d eqn=%d node=%d\n",E->sphere.capid[CPPR],E->parallel.NUM_NEQ[lev][CPPR].pass[kkkp],E->parallel.NUM_NODE[lev][CPPR].pass[kkkp]);
- for (ii=1;ii<=E->parallel.NUM_NEQ[lev][CPPR].pass[kkkp];ii++)
+ fprintf(E->fp_out,"cap=%d eqn=%d node=%d\n",E->sphere.capid[CPPR],E->parallel.NUM_NEQ[lev].pass[kkkp],E->parallel.NUM_NODE[lev][CPPR].pass[kkkp]);
+ 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][CPPR][ii].pass[kkkp]);
for (ii=1;ii<=E->parallel.NUM_NODE[lev][CPPR].pass[kkkp];ii++)
fprintf(E->fp_out,"%d %d\n",ii,E->parallel.EXCHANGE_NODE[lev][CPPR][ii].pass[kkkp]);
@@ -825,7 +825,7 @@ static void face_eqn_node_to_pass(E,lev,npass,bd)
E->parallel.EXCHANGE_ID[lev][CPPR][++jj].pass[npass] = E->ID[lev][node].doff[doff];
}
- E->parallel.NUM_NEQ[lev][CPPR].pass[npass] = jj;
+ E->parallel.NUM_NEQ[lev].pass[npass] = jj;
}
/* ================================================ */
@@ -848,7 +848,7 @@ static void line_eqn_node_to_pass(E,lev,npass,num_node,offset,stride)
E->parallel.EXCHANGE_ID[lev][CPPR][++jj].pass[npass] = E->ID[lev][node].doff[doff];
}
- E->parallel.NUM_NEQ[lev][CPPR].pass[npass] = jj;
+ E->parallel.NUM_NEQ[lev].pass[npass] = jj;
}
void full_exchange_id_d(E, U, lev)
@@ -866,7 +866,7 @@ void full_exchange_id_d(E, U, lev)
MPI_Request request[100];
for (k=1;k<=E->parallel.TNUM_PASS[lev];k++) {
- sizeofk = (1+E->parallel.NUM_NEQ[lev][CPPR].pass[k])*sizeof(double);
+ sizeofk = (1+E->parallel.NUM_NEQ[lev].pass[k])*sizeof(double);
S[k]=(double *)malloc( sizeofk );
R[k]=(double *)malloc( sizeofk );
}
@@ -882,14 +882,14 @@ void full_exchange_id_d(E, U, lev)
idb=0;
for (k=1;k<=E->parallel.TNUM_PASS[lev];k++) {
- for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[k];j++) {
+ for (j=1;j<=E->parallel.NUM_NEQ[lev].pass[k];j++) {
S[k][j-1] = U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ];
}
if (E->parallel.PROCESSOR[lev][CPPR].pass[k] != E->parallel.me &&
E->parallel.PROCESSOR[lev][CPPR].pass[k] != -1) {
idb ++;
- MPI_Isend(S[k], E->parallel.NUM_NEQ[lev][CPPR].pass[k], MPI_DOUBLE,
+ MPI_Isend(S[k], E->parallel.NUM_NEQ[lev].pass[k], MPI_DOUBLE,
E->parallel.PROCESSOR[lev][CPPR].pass[k], 1,
E->parallel.world, &request[idb-1]);
}
@@ -900,12 +900,12 @@ void full_exchange_id_d(E, U, lev)
if (E->parallel.PROCESSOR[lev][CPPR].pass[k] != E->parallel.me &&
E->parallel.PROCESSOR[lev][CPPR].pass[k] != -1) {
idb++;
- MPI_Irecv(R[k],E->parallel.NUM_NEQ[lev][CPPR].pass[k], MPI_DOUBLE,
+ MPI_Irecv(R[k],E->parallel.NUM_NEQ[lev].pass[k], MPI_DOUBLE,
E->parallel.PROCESSOR[lev][CPPR].pass[k], 1,
E->parallel.world, &request[idb-1]);
}
else {
- for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[k];j++)
+ for (j=1;j<=E->parallel.NUM_NEQ[lev].pass[k];j++)
U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ] += S[k][j-1];
}
} /* for k */
@@ -916,7 +916,7 @@ void full_exchange_id_d(E, U, lev)
if (E->parallel.PROCESSOR[lev][CPPR].pass[k] != E->parallel.me &&
E->parallel.PROCESSOR[lev][CPPR].pass[k] != -1) {
- for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[k];j++)
+ for (j=1;j<=E->parallel.NUM_NEQ[lev].pass[k];j++)
U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ] += R[k][j-1];
}
}
@@ -927,7 +927,7 @@ void full_exchange_id_d(E, U, lev)
jj = 0;
kk = k + E->sphere.max_connections;
- for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[kk];j++)
+ for (j=1;j<=E->parallel.NUM_NEQ[lev].pass[kk];j++)
SV[jj++] = U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[kk] ];
MPI_Sendrecv(SV, E->parallel.NUM_NEQz[lev].pass[k], MPI_DOUBLE,
@@ -937,7 +937,7 @@ void full_exchange_id_d(E, U, lev)
E->parallel.world, &status1);
jj = 0;
- for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[kk];j++)
+ for (j=1;j<=E->parallel.NUM_NEQ[lev].pass[kk];j++)
U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[kk] ] += RV[jj++];
}
diff --git a/lib/Regional_parallel_related.c b/lib/Regional_parallel_related.c
index e90e87f..3c05973 100644
--- a/lib/Regional_parallel_related.c
+++ b/lib/Regional_parallel_related.c
@@ -490,7 +490,7 @@ void regional_parallel_communication_routs_v(E)
E->parallel.EXCHANGE_ID[lev][CPPR][++jj].pass[kkk] = E->ID[lev][node].doff[doff];
} /* end for node k */
- E->parallel.NUM_NEQ[lev][CPPR].pass[kkk] = jj;
+ E->parallel.NUM_NEQ[lev].pass[kkk] = jj;
} /* end if */
} /* end for i */
@@ -525,7 +525,7 @@ void regional_parallel_communication_routs_v(E)
E->parallel.EXCHANGE_ID[lev][CPPR][++jj].pass[kkk] = E->ID[lev][node].doff[doff];
} /* end for node kk */
- E->parallel.NUM_NEQ[lev][CPPR].pass[kkk] = jj;
+ E->parallel.NUM_NEQ[lev].pass[kkk] = jj;
} /* end if */
@@ -560,7 +560,7 @@ void regional_parallel_communication_routs_v(E)
E->parallel.EXCHANGE_ID[lev][CPPR][++jj].pass[kkk] = E->ID[lev][node].doff[doff];
} /* end for node k */
- E->parallel.NUM_NEQ[lev][CPPR].pass[kkk] = jj;
+ E->parallel.NUM_NEQ[lev].pass[kkk] = jj;
} /* end if */
@@ -578,7 +578,7 @@ void regional_parallel_communication_routs_v(E)
fprintf(E->fp_out,"output_communication route surface for lev=%d \n",lev);
fprintf(E->fp_out," me= %d cap=%d pass %d \n",E->parallel.me,E->sphere.capid[CPPR],E->parallel.TNUM_PASS[lev]);
for (k=1;k<=E->parallel.TNUM_PASS[lev];k++) {
- fprintf(E->fp_out,"proc %d and pass %d to proc %d with %d eqn and %d node\n",E->parallel.me,k,E->parallel.PROCESSOR[lev][CPPR].pass[k],E->parallel.NUM_NEQ[lev][CPPR].pass[k],E->parallel.NUM_NODE[lev][CPPR].pass[k]);
+ fprintf(E->fp_out,"proc %d and pass %d to proc %d with %d eqn and %d node\n",E->parallel.me,k,E->parallel.PROCESSOR[lev][CPPR].pass[k],E->parallel.NUM_NEQ[lev].pass[k],E->parallel.NUM_NODE[lev][CPPR].pass[k]);
/* fprintf(E->fp_out,"Eqn:\n"); */
/* for (ii=1;ii<=E->parallel.NUM_NEQ[lev][m].pass[k];ii++) */
/* fprintf(E->fp_out,"%d %d\n",ii,E->parallel.EXCHANGE_ID[lev][m][ii].pass[k]); */
@@ -710,23 +710,23 @@ void regional_exchange_id_d(E, U, lev)
MPI_Status status;
for (k=1;k<=E->parallel.TNUM_PASS[lev];k++) {
- sizeofk = (1+E->parallel.NUM_NEQ[lev][CPPR].pass[k])*sizeof(double);
+ sizeofk = (1+E->parallel.NUM_NEQ[lev].pass[k])*sizeof(double);
S[k]=(double *)malloc( sizeofk );
R[k]=(double *)malloc( sizeofk );
}
for (k=1;k<=E->parallel.TNUM_PASS[lev];k++) {
- for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[k];j++)
+ for (j=1;j<=E->parallel.NUM_NEQ[lev].pass[k];j++)
S[k][j-1] = U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ];
- MPI_Sendrecv(S[k],E->parallel.NUM_NEQ[lev][CPPR].pass[k],MPI_DOUBLE,
+ MPI_Sendrecv(S[k],E->parallel.NUM_NEQ[lev].pass[k],MPI_DOUBLE,
E->parallel.PROCESSOR[lev][CPPR].pass[k],1,
- R[k],E->parallel.NUM_NEQ[lev][CPPR].pass[k],MPI_DOUBLE,
+ R[k],E->parallel.NUM_NEQ[lev].pass[k],MPI_DOUBLE,
E->parallel.PROCESSOR[lev][CPPR].pass[k],1,
E->parallel.world,&status);
- for (j=1;j<=E->parallel.NUM_NEQ[lev][CPPR].pass[k];j++)
+ for (j=1;j<=E->parallel.NUM_NEQ[lev].pass[k];j++)
U[ E->parallel.EXCHANGE_ID[lev][CPPR][j].pass[k] ] += R[k][j-1];
} /* for k */
diff --git a/lib/global_defs.h b/lib/global_defs.h
index a1b8028..b7993d2 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -239,7 +239,7 @@ struct Parallel {
struct BOUND *NODE[MAX_LEVELS][NCS];
struct BOUND NUM_NNO[MAX_LEVELS];
struct BOUND NUM_PASS[MAX_LEVELS];
- struct PASS NUM_NEQ[MAX_LEVELS][NCS];
+ struct PASS NUM_NEQ[MAX_LEVELS];
struct PASS NUM_NODE[MAX_LEVELS][NCS];
struct PASS PROCESSOR[MAX_LEVELS][NCS];
struct PASS *EXCHANGE_ID[MAX_LEVELS][NCS];
More information about the CIG-COMMITS
mailing list