[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->Eqn_k3 as part of caps_per_proc_removal (38ac165)

[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 38ac1659800d1e235319aefacda981ad5f286eeb
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Sep 24 13:41:30 2014 -0700

    Changed the shape of E->Eqn_k3 as part of caps_per_proc_removal


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

38ac1659800d1e235319aefacda981ad5f286eeb
 lib/Construct_arrays.c         | 12 ++++++------
 lib/Element_calculations.c     |  2 +-
 lib/General_matrix_functions.c |  2 +-
 lib/global_defs.h              |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index b00ba81..5880344 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -291,7 +291,7 @@ void construct_node_maps(E)
 
        E->Eqn_k1[lev] = (higher_precision *)malloc(matrix*sizeof(higher_precision));
        E->Eqn_k2[lev] = (higher_precision *)malloc(matrix*sizeof(higher_precision));
-       E->Eqn_k3[lev][CPPR] = (higher_precision *)malloc(matrix*sizeof(higher_precision));
+       E->Eqn_k3[lev] = (higher_precision *)malloc(matrix*sizeof(higher_precision));
 
        E->mesh.matrix_size[lev] = matrix;
 
@@ -340,7 +340,7 @@ void construct_node_ks(E)
         for(i=0;i<E->mesh.matrix_size[level];i++) {
             E->Eqn_k1[level][i] = zero;
             E->Eqn_k2[level][i] = zero;
-            E->Eqn_k3[level][CPPR][i] = zero;
+            E->Eqn_k3[level][i] = zero;
             }
 
         for(element=1;element<=nel;element++) {
@@ -394,7 +394,7 @@ void construct_node_ks(E)
 
 		    E->Eqn_k1[level][loc0+index] +=  w1*ww1*elt_K[pp*lms+qq]; /* direction 1 */
 		    E->Eqn_k2[level][loc0+index] +=  w2*ww1*elt_K[(pp+1)*lms+qq]; /* direction 1 */
-		    E->Eqn_k3[level][CPPR][loc0+index] +=  w3*ww1*elt_K[(pp+2)*lms+qq]; /* direction 1 */
+		    E->Eqn_k3[level][loc0+index] +=  w3*ww1*elt_K[(pp+2)*lms+qq]; /* direction 1 */
 
 		     /* search for direction 2*/
 
@@ -410,7 +410,7 @@ void construct_node_ks(E)
 
 		    E->Eqn_k1[level][loc0+index] += w1*ww2*elt_K[pp*lms+qq+1]; /* direction 1 */
 		    E->Eqn_k2[level][loc0+index] += w2*ww2*elt_K[(pp+1)*lms+qq+1]; /* direction 2 */
-		    E->Eqn_k3[level][CPPR][loc0+index] += w3*ww2*elt_K[(pp+2)*lms+qq+1]; /* direction 3 */
+		    E->Eqn_k3[level][loc0+index] += w3*ww2*elt_K[(pp+2)*lms+qq+1]; /* direction 3 */
 
 		    /* search for direction 3*/
 
@@ -426,7 +426,7 @@ void construct_node_ks(E)
 
 		    E->Eqn_k1[level][loc0+index] += w1*ww3*elt_K[pp*lms+qq+2]; /* direction 1 */
         E->Eqn_k2[level][loc0+index] += w2*ww3*elt_K[(pp+1)*lms+qq+2]; /* direction 2 */
-		    E->Eqn_k3[level][CPPR][loc0+index] += w3*ww3*elt_K[(pp+2)*lms+qq+2]; /* direction 3 */
+		    E->Eqn_k3[level][loc0+index] += w3*ww3*elt_K[(pp+2)*lms+qq+2]; /* direction 3 */
 
 		    }   /* end for j */
 		  }   /* end for node1<= node */
@@ -472,7 +472,7 @@ void rebuild_BI_on_boundary(E)
             C=E->Node_map[level] + (i-1)*max_eqn;
             B1=E->Eqn_k1[level]+(i-1)*max_eqn;
             B2=E->Eqn_k2[level]+(i-1)*max_eqn;
-            B3=E->Eqn_k3[level][CPPR]+(i-1)*max_eqn;
+            B3=E->Eqn_k3[level]+(i-1)*max_eqn;
 
             for(j=3;j<max_eqn;j++) {
                 E->temp[eqn1] += fabs(B1[j]);
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 3c4d0f4..43c3f52 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -538,7 +538,7 @@ void n_assemble_del2_u(E,u,Au,level,strip_bcs)
        C=E->Node_map[level] + (e-1)*max_eqn;
        B1=E->Eqn_k1[level]+(e-1)*max_eqn;
        B2=E->Eqn_k2[level]+(e-1)*max_eqn;
-       B3=E->Eqn_k3[level][CPPR]+(e-1)*max_eqn;
+       B3=E->Eqn_k3[level]+(e-1)*max_eqn;
 
        for(i=3;i<max_eqn;i++)  {
 	  UU = u[C[i]];
diff --git a/lib/General_matrix_functions.c b/lib/General_matrix_functions.c
index 5257c81..eeeb9d5 100644
--- a/lib/General_matrix_functions.c
+++ b/lib/General_matrix_functions.c
@@ -486,7 +486,7 @@ void gauss_seidel(E,d0,F,Ad,acc,cycles,level,guess)
             C=E->Node_map[level]+(i-1)*max_eqn;
 	    B1=E->Eqn_k1[level]+(i-1)*max_eqn;
 	    B2=E->Eqn_k2[level]+(i-1)*max_eqn;
- 	    B3=E->Eqn_k3[level][CPPR]+(i-1)*max_eqn;
+ 	    B3=E->Eqn_k3[level]+(i-1)*max_eqn;
 
                  /* Ad on boundaries differs after the following operation, but
                   no communications are needed yet, because boundary Ad will
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 48eead5..12408b0 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -819,7 +819,7 @@ struct All_variables {
     struct REF_STATE refstate;
 
 
-    higher_precision *Eqn_k1[MAX_LEVELS],*Eqn_k2[MAX_LEVELS],*Eqn_k3[MAX_LEVELS][NCS];
+    higher_precision *Eqn_k1[MAX_LEVELS],*Eqn_k2[MAX_LEVELS],*Eqn_k3[MAX_LEVELS];
     int *Node_map [MAX_LEVELS];
 
     double *BI[MAX_LEVELS],*BPI[MAX_LEVELS];