[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->parallel.NUM_PASS as part of caps_per_proc_removal (e6b1cf8)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:12:46 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit e6b1cf8c3200fdce47fce17baae5e81586424cea
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Wed Sep 24 10:51:45 2014 -0700
Changed the shape of E->parallel.NUM_PASS as part of caps_per_proc_removal
>---------------------------------------------------------------
e6b1cf8c3200fdce47fce17baae5e81586424cea
lib/Regional_parallel_related.c | 40 ++++++++++++++++++++--------------------
lib/Regional_tracer_advection.c | 2 +-
lib/global_defs.h | 2 +-
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/lib/Regional_parallel_related.c b/lib/Regional_parallel_related.c
index ee83982..e90e87f 100644
--- a/lib/Regional_parallel_related.c
+++ b/lib/Regional_parallel_related.c
@@ -464,13 +464,13 @@ void regional_parallel_communication_routs_v(E)
for(i=1;i<=2;i++) { /* do YOZ boundaries & OY lines */
ii ++;
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 1;
+ E->parallel.NUM_PASS[lev].bound[ii] = 1;
if(E->parallel.me_loc[1]==0 && i==1)
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 0;
+ E->parallel.NUM_PASS[lev].bound[ii] = 0;
else if(E->parallel.me_loc[1]==nprocxl-1 && i==2)
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 0;
+ E->parallel.NUM_PASS[lev].bound[ii] = 0;
- if (E->parallel.NUM_PASS[lev][CPPR].bound[ii] == 1) {
+ if (E->parallel.NUM_PASS[lev].bound[ii] == 1) {
kkk ++;
/* determine the pass ID for ii-th boundary and kkk-th pass */
@@ -498,13 +498,13 @@ void regional_parallel_communication_routs_v(E)
for(k=1;k<=2;k++) { /* do XOZ boundaries & OZ lines */
ii ++;
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 1;
+ E->parallel.NUM_PASS[lev].bound[ii] = 1;
if(E->parallel.me_loc[2]==0 && k==1)
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 0;
+ E->parallel.NUM_PASS[lev].bound[ii] = 0;
else if(E->parallel.me_loc[2]==nprocyl-1 && k==2)
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 0;
+ E->parallel.NUM_PASS[lev].bound[ii] = 0;
- if(E->parallel.NUM_PASS[lev][CPPR].bound[ii] == 1) {
+ if(E->parallel.NUM_PASS[lev].bound[ii] == 1) {
kkk ++;
/* determine the pass ID for ii-th boundary and kkk-th pass */
@@ -534,13 +534,13 @@ void regional_parallel_communication_routs_v(E)
for(j=1;j<=2;j++) { /* do XOY boundaries & OX lines */
ii ++;
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 1;
+ E->parallel.NUM_PASS[lev].bound[ii] = 1;
if(E->parallel.me_loc[3]==0 && j==1)
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 0;
+ E->parallel.NUM_PASS[lev].bound[ii] = 0;
else if(E->parallel.me_loc[3]==nproczl-1 && j==2)
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 0;
+ E->parallel.NUM_PASS[lev].bound[ii] = 0;
- if(E->parallel.NUM_PASS[lev][CPPR].bound[ii] == 1) {
+ if(E->parallel.NUM_PASS[lev].bound[ii] == 1) {
kkk ++;
/* determine the pass ID for ii-th boundary and kkk-th pass */
@@ -632,13 +632,13 @@ void regional_parallel_communication_routs_s(E)
for(i=1;i<=2;i++) { /* do YOZ boundaries & OY lines */
ii ++;
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 1;
+ E->parallel.NUM_PASS[lev].bound[ii] = 1;
if(E->parallel.me_loc[1]==0 && i==1)
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 0;
+ E->parallel.NUM_PASS[lev].bound[ii] = 0;
else if(E->parallel.me_loc[1]==nprocxl-1 && i==2)
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 0;
+ E->parallel.NUM_PASS[lev].bound[ii] = 0;
- for (p=1;p<=E->parallel.NUM_PASS[lev][CPPR].bound[ii];p++) {
+ for (p=1;p<=E->parallel.NUM_PASS[lev].bound[ii];p++) {
kkk ++;
/* determine the pass ID for ii-th boundary and p-th pass */
@@ -659,13 +659,13 @@ void regional_parallel_communication_routs_s(E)
for(k=1;k<=2;k++) { /* do XOZ boundaries & OX lines */
ii ++;
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 1;
+ E->parallel.NUM_PASS[lev].bound[ii] = 1;
if(E->parallel.me_loc[2]==0 && k==1)
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 0;
+ E->parallel.NUM_PASS[lev].bound[ii] = 0;
else if(E->parallel.me_loc[2]==nprocyl-1 && k==2)
- E->parallel.NUM_PASS[lev][CPPR].bound[ii] = 0;
+ E->parallel.NUM_PASS[lev].bound[ii] = 0;
- for (p=1;p<=E->parallel.NUM_PASS[lev][CPPR].bound[ii];p++) {
+ for (p=1;p<=E->parallel.NUM_PASS[lev].bound[ii];p++) {
kkk ++;
/* determine the pass ID for ii-th boundary and p-th pass */
diff --git a/lib/Regional_tracer_advection.c b/lib/Regional_tracer_advection.c
index a7cdbe7..715ad1a 100644
--- a/lib/Regional_tracer_advection.c
+++ b/lib/Regional_tracer_advection.c
@@ -562,7 +562,7 @@ void regional_lost_souls(struct All_variables *E)
/* if ngbr_rank is -1, there is no neighbor on this side */
ipass = 1;
for (kk=1; kk<=6; kk++) {
- if (E->parallel.NUM_PASS[lev][CPPR].bound[kk] == 1) {
+ if (E->parallel.NUM_PASS[lev].bound[kk] == 1) {
ngbr_rank[kk] = E->parallel.PROCESSOR[lev][CPPR].pass[ipass];
ipass++;
}
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 367238a..a1b8028 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -238,7 +238,7 @@ struct Parallel {
int TNUM_PASS[MAX_LEVELS];
struct BOUND *NODE[MAX_LEVELS][NCS];
struct BOUND NUM_NNO[MAX_LEVELS];
- struct BOUND NUM_PASS[MAX_LEVELS][NCS];
+ struct BOUND NUM_PASS[MAX_LEVELS];
struct PASS NUM_NEQ[MAX_LEVELS][NCS];
struct PASS NUM_NODE[MAX_LEVELS][NCS];
struct PASS PROCESSOR[MAX_LEVELS][NCS];
More information about the CIG-COMMITS
mailing list