[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->num_zero_resid as part of caps_per_proc removal (3a301a0)

[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 3a301a050ecdb63156e91b9e4fd4e93dff858eb2
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Tue Sep 23 14:31:28 2014 -0700

    Changed the shape of E->num_zero_resid as part of caps_per_proc removal


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

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

diff --git a/lib/BC_util.c b/lib/BC_util.c
index 88418f8..97a2375 100644
--- a/lib/BC_util.c
+++ b/lib/BC_util.c
@@ -93,8 +93,8 @@ void strip_bcs_from_residual(E,Res,level)
 {
     int m,i;
 
-    if (E->num_zero_resid[level][CPPR])
-      for(i=1;i<=E->num_zero_resid[level][CPPR];i++)
+    if (E->num_zero_resid[level])
+      for(i=1;i<=E->num_zero_resid[level];i++)
          Res[E->zero_resid[level][CPPR][i]] = 0.0;
 
 }
diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index b760531..233b680 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -210,7 +210,7 @@ void get_bcs_id_for_residual(E,level)
 	}
       }
 
-    E->num_zero_resid[level][CPPR] = j;
+    E->num_zero_resid[level] = j;
 }
 
 /*==========================================================
diff --git a/lib/Petsc_citcoms.c b/lib/Petsc_citcoms.c
index 3c7e88a..57ef8ba 100644
--- a/lib/Petsc_citcoms.c
+++ b/lib/Petsc_citcoms.c
@@ -123,8 +123,8 @@ void strip_bcs_from_residual_PETSc(
   PetscErrorCode ierr;
   PetscScalar *ResData;
   ierr = VecGetArray(Res, &ResData);
-    if( E->num_zero_resid[level][CPPR] ) {
-      for( i = 1; i <= E->num_zero_resid[level][CPPR]; i++ ) {
+    if( E->num_zero_resid[level] ) {
+      for( i = 1; i <= E->num_zero_resid[level]; i++ ) {
         ResData[E->zero_resid[level][CPPR][i]] = 0.0;
       }
     }
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 56d1aba..5c0ca13 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -858,7 +858,7 @@ struct All_variables {
 #endif
 
 
-    int num_zero_resid[MAX_LEVELS][NCS];
+    int num_zero_resid[MAX_LEVELS];
     int *zero_resid[MAX_LEVELS][NCS];
     int *surf_element,*surf_node;
     int *mat;