[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->parallel.sTNUM_PASS as part of caps_per_proc_removal (e718554)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/citcoms

On branch  : rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

>---------------------------------------------------------------

commit e71855495ffc73e73cfc72fef6fb7b4e56129df1
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Sep 24 11:19:52 2014 -0700

    Changed the shape of E->parallel.sTNUM_PASS as part of caps_per_proc_removal


>---------------------------------------------------------------

e71855495ffc73e73cfc72fef6fb7b4e56129df1
 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 9d6b6e6..ca0a0fa 100644
--- a/lib/Regional_parallel_related.c
+++ b/lib/Regional_parallel_related.c
@@ -686,7 +686,7 @@ void regional_parallel_communication_routs_s(E)
             }  /* end for k */
 
 
-    E->parallel.sTNUM_PASS[lev][CPPR] = kkk;
+    E->parallel.sTNUM_PASS[lev] = kkk;
 
 
 
@@ -835,13 +835,13 @@ void regional_exchange_snode_f(struct All_variables *E, float *U1,
 
  MPI_Status status;
 
- for (k=1;k<=E->parallel.sTNUM_PASS[lev][CPPR];k++)  {
+ for (k=1;k<=E->parallel.sTNUM_PASS[lev];k++)  {
    sizeofk = (1+2*E->parallel.NUM_sNODE[lev][CPPR].pass[k])*sizeof(float);
    S[k]=(float *)malloc( sizeofk );
    R[k]=(float *)malloc( sizeofk );
  }
 
-   for (k=1;k<=E->parallel.sTNUM_PASS[lev][CPPR];k++)  {
+   for (k=1;k<=E->parallel.sTNUM_PASS[lev];k++)  {
 
      for (j=1;j<=E->parallel.NUM_sNODE[lev][CPPR].pass[k];j++)  {
        S[k][j-1] = U1[ E->parallel.EXCHANGE_sNODE[lev][CPPR][j].pass[k] ];
@@ -863,7 +863,7 @@ void regional_exchange_snode_f(struct All_variables *E, float *U1,
 
    }
 
- for (k=1;k<=E->parallel.sTNUM_PASS[lev][CPPR];k++)  {
+ for (k=1;k<=E->parallel.sTNUM_PASS[lev];k++)  {
    free((void*) S[k]);
    free((void*) R[k]);
  }
diff --git a/lib/global_defs.h b/lib/global_defs.h
index bd616ab..4cb9e23 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -251,7 +251,7 @@ struct Parallel {
     struct PASS NUM_NEQz[MAX_LEVELS];
     struct PASS NUM_NODEz[MAX_LEVELS];
 
-    int sTNUM_PASS[MAX_LEVELS][NCS];
+    int sTNUM_PASS[MAX_LEVELS];
     struct PASS NUM_sNODE[MAX_LEVELS][NCS];
     struct PASS sPROCESSOR[MAX_LEVELS][NCS];
     struct PASS *EXCHANGE_sNODE[MAX_LEVELS][NCS];