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

[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 12ccfc4ada119f3f0dfec3f9a968b1e7cd51998d
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Sep 24 09:20:38 2014 -0700

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


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

12ccfc4ada119f3f0dfec3f9a968b1e7cd51998d
 lib/Construct_arrays.c  | 2 +-
 lib/Global_operations.c | 8 ++++----
 lib/Instructions.c      | 2 +-
 lib/global_defs.h       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index e4e28de..11e1e72 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -157,7 +157,7 @@ void construct_id(E)
         if (E->NODE[lev][node] & SKIP)
         for(doff=1;doff<=dims;doff++)  {
 	  i++;
-          E->parallel.Skip_id[lev][CPPR][i] = E->ID[lev][node].doff[doff];
+          E->parallel.Skip_id[lev][i] = E->ID[lev][node].doff[doff];
           }
         }
 
diff --git a/lib/Global_operations.c b/lib/Global_operations.c
index 241a2f4..3fbcc11 100644
--- a/lib/Global_operations.c
+++ b/lib/Global_operations.c
@@ -471,7 +471,7 @@ float global_fvdot(E,A,B,lev)
       temp += A[CPPR][i]*B[CPPR][i];
 
     for (i=1;i<=E->parallel.Skip_neq[lev];i++)
-       temp1 += A[CPPR][E->parallel.Skip_id[lev][CPPR][i]]*B[CPPR][E->parallel.Skip_id[lev][CPPR][i]];
+       temp1 += A[CPPR][E->parallel.Skip_id[lev][i]]*B[CPPR][E->parallel.Skip_id[lev][i]];
 
     temp -= temp1;
 
@@ -501,8 +501,8 @@ double kineticE_radial(E,A,lev)
         temp += A[CPPR][i]*A[CPPR][i];
 
     for (i=1;i<=E->parallel.Skip_neq[lev];i++)
-      if ((E->parallel.Skip_id[lev][CPPR][i]+1)%3==0)
-        temp1 += A[CPPR][E->parallel.Skip_id[lev][CPPR][i]]*A[CPPR][E->parallel.Skip_id[lev][CPPR][i]];
+      if ((E->parallel.Skip_id[lev][i]+1)%3==0)
+        temp1 += A[CPPR][E->parallel.Skip_id[lev][i]]*A[CPPR][E->parallel.Skip_id[lev][i]];
 
     temp -= temp1;
 
@@ -530,7 +530,7 @@ double global_vdot(E,A,B,lev)
       temp += A[i]*B[i];
 
     for (i=1;i<=E->parallel.Skip_neq[lev];i++)
-       temp1 += A[E->parallel.Skip_id[lev][CPPR][i]]*B[E->parallel.Skip_id[lev][CPPR][i]];
+       temp1 += A[E->parallel.Skip_id[lev][i]]*B[E->parallel.Skip_id[lev][i]];
 
     temp -= temp1;
 
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 147362f..b1d5f6f 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1200,7 +1200,7 @@ void allocate_velocity_vars(E)
       k = (E->lmesh.NOX[l]*E->lmesh.NOZ[l]+E->lmesh.NOX[l]*E->lmesh.NOY[l]+
           E->lmesh.NOY[l]*E->lmesh.NOZ[l])*6;
       E->zero_resid[l] = (int *) malloc((k+2)*sizeof(int));
-      E->parallel.Skip_id[l][CPPR] = (int *) malloc((k+2)*sizeof(int));
+      E->parallel.Skip_id[l] = (int *) malloc((k+2)*sizeof(int));
 
       for(i=0;i<E->lmesh.NEQ[l];i++) {
          E->BI[l][i]=0.0;
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 6342716..ed874b6 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -233,7 +233,7 @@ struct Parallel {
     int me_loc[4];
     int num_b;
     int Skip_neq[MAX_LEVELS];
-    int *Skip_id[MAX_LEVELS][NCS];
+    int *Skip_id[MAX_LEVELS];
 
     int TNUM_PASS[MAX_LEVELS][NCS];
     struct BOUND *NODE[MAX_LEVELS][NCS];