[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->parallel.sPROCESSOR as part of caps_per_proc_removal (096f7b9)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Sep 24 15:23:32 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/980de677d7efb78fdd5c41fd4b35a9283a2d251f...b86b2dd00f2bd13fb282a2eb9169871be4b1e923
>---------------------------------------------------------------
commit 096f7b98f320ec2989185814640788425952a7e9
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 11:25:47 2014 -0700
Changed the shape of E->parallel.sPROCESSOR as part of caps_per_proc_removal
>---------------------------------------------------------------
096f7b98f320ec2989185814640788425952a7e9
lib/Regional_parallel_related.c | 8 ++++----
lib/global_defs.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/Regional_parallel_related.c b/lib/Regional_parallel_related.c
index be8d57f..627ea32 100644
--- a/lib/Regional_parallel_related.c
+++ b/lib/Regional_parallel_related.c
@@ -642,7 +642,7 @@ void regional_parallel_communication_routs_s(E)
kkk ++;
/* determine the pass ID for ii-th boundary and p-th pass */
- E->parallel.sPROCESSOR[lev][CPPR].pass[kkk]=me-((i==1)?1:-1)*nproczl;
+ E->parallel.sPROCESSOR[lev].pass[kkk]=me-((i==1)?1:-1)*nproczl;
E->parallel.NUM_sNODE[lev].pass[kkk] =
E->parallel.NUM_NNO[lev].bound[ii]/noz;
@@ -670,7 +670,7 @@ void regional_parallel_communication_routs_s(E)
kkk ++;
/* determine the pass ID for ii-th boundary and p-th pass */
- E->parallel.sPROCESSOR[lev][CPPR].pass[kkk]=me-((k==1)?1:-1)*nprocxl*nproczl;
+ E->parallel.sPROCESSOR[lev].pass[kkk]=me-((k==1)?1:-1)*nprocxl*nproczl;
E->parallel.NUM_sNODE[lev].pass[kkk] =
E->parallel.NUM_NNO[lev].bound[ii]/noz;
@@ -850,9 +850,9 @@ void regional_exchange_snode_f(struct All_variables *E, float *U1,
}
MPI_Sendrecv(S[k],2*E->parallel.NUM_sNODE[lev].pass[k],MPI_FLOAT,
- E->parallel.sPROCESSOR[lev][CPPR].pass[k],1,
+ E->parallel.sPROCESSOR[lev].pass[k],1,
R[k],2*E->parallel.NUM_sNODE[lev].pass[k],MPI_FLOAT,
- E->parallel.sPROCESSOR[lev][CPPR].pass[k],1,
+ E->parallel.sPROCESSOR[lev].pass[k],1,
E->parallel.world,&status);
for (j=1;j<=E->parallel.NUM_sNODE[lev].pass[k];j++) {
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 55c24ff..d2242b7 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -253,7 +253,7 @@ struct Parallel {
int sTNUM_PASS[MAX_LEVELS];
struct PASS NUM_sNODE[MAX_LEVELS];
- struct PASS sPROCESSOR[MAX_LEVELS][NCS];
+ struct PASS sPROCESSOR[MAX_LEVELS];
struct PASS *EXCHANGE_sNODE[MAX_LEVELS][NCS];
};
More information about the CIG-COMMITS
mailing list