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

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

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


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

4e06d56c9fd0470fccf34ca284d419063d07d753
 lib/Construct_arrays.c  | 4 ++--
 lib/Global_operations.c | 6 +++---
 lib/global_defs.h       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index 5eeb907..e4e28de 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -161,10 +161,10 @@ void construct_id(E)
           }
         }
 
-      E->parallel.Skip_neq[lev][CPPR] = i;
+      E->parallel.Skip_neq[lev] = i;
 
       /* global # of unskipped eqn */
-      neq = E->lmesh.NEQ[lev] - E->parallel.Skip_neq[lev][CPPR];
+      neq = E->lmesh.NEQ[lev] - E->parallel.Skip_neq[lev];
       MPI_Allreduce(&neq, &gneq, 1, MPI_INT, MPI_SUM, E->parallel.world);
       E->mesh.NEQ[lev] = gneq;
 
diff --git a/lib/Global_operations.c b/lib/Global_operations.c
index 0cec81d..241a2f4 100644
--- a/lib/Global_operations.c
+++ b/lib/Global_operations.c
@@ -470,7 +470,7 @@ float global_fvdot(E,A,B,lev)
     for (i=0;i<neq;i++)
       temp += A[CPPR][i]*B[CPPR][i];
 
-    for (i=1;i<=E->parallel.Skip_neq[lev][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]];
 
     temp -= temp1;
@@ -500,7 +500,7 @@ double kineticE_radial(E,A,lev)
       if ((i+1)%3==0)
         temp += A[CPPR][i]*A[CPPR][i];
 
-    for (i=1;i<=E->parallel.Skip_neq[lev][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]];
 
@@ -529,7 +529,7 @@ double global_vdot(E,A,B,lev)
     for (i=0;i<neq;i++)
       temp += A[i]*B[i];
 
-    for (i=1;i<=E->parallel.Skip_neq[lev][CPPR];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]];
 
     temp -= temp1;
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 5eafb74..6342716 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -232,7 +232,7 @@ struct Parallel {
     int idb;
     int me_loc[4];
     int num_b;
-    int Skip_neq[MAX_LEVELS][NCS];
+    int Skip_neq[MAX_LEVELS];
     int *Skip_id[MAX_LEVELS][NCS];
 
     int TNUM_PASS[MAX_LEVELS][NCS];