[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->elt_k as part of caps_per_proc removal (509b363)

[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 509b363aa850c1cfe708999e725aa3f74ecfe445
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Tue Sep 23 18:37:49 2014 -0700

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


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

509b363aa850c1cfe708999e725aa3f74ecfe445
 lib/Construct_arrays.c     |  6 +++---
 lib/Drive_solvers.c        |  2 +-
 lib/Element_calculations.c | 18 +++++++++---------
 lib/global_defs.h          |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index 974ac67..5eeb907 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -616,12 +616,12 @@ void construct_elt_ks(E)
 
 	for(el=1;el<=E->lmesh.NEL[lev];el++)    {
 
-	    get_elt_k(E,el,E->elt_k[lev][CPPR][el].k,lev,0);
+	    get_elt_k(E,el,E->elt_k[lev][el].k,lev,0);
 
 	    if (E->control.augmented_Lagr)
-	        get_aug_k(E,el,E->elt_k[lev][CPPR][el].k,lev);
+	        get_aug_k(E,el,E->elt_k[lev][el].k,lev);
 
-            build_diagonal_of_K(E,el,E->elt_k[lev][CPPR][el].k,lev);
+            build_diagonal_of_K(E,el,E->elt_k[lev][el].k,lev);
 
 	    }
 
diff --git a/lib/Drive_solvers.c b/lib/Drive_solvers.c
index e6dcb7c..f31c481 100644
--- a/lib/Drive_solvers.c
+++ b/lib/Drive_solvers.c
@@ -52,7 +52,7 @@ void general_stokes_solver_setup(struct All_variables *E)
     construct_node_maps(E);
   else
     for (i=E->mesh.gridmin;i<=E->mesh.gridmax;i++)
-      E->elt_k[i][CPPR]=(struct EK *)malloc((E->lmesh.NEL[i]+1)*sizeof(struct EK));
+      E->elt_k[i]=(struct EK *)malloc((E->lmesh.NEL[i]+1)*sizeof(struct EK));
 
 #ifdef USE_PETSC
   /*
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 6447ea5..8ecf759 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -462,27 +462,27 @@ void e_assemble_del2_u(E,u,Au,level,strip_bcs)
 	  ii = (a*n+b)*dims-(dims*n+dims);
 	  /* i=1, j=1,2,3 */
 		Au[a1] +=
-		        E->elt_k[level][CPPR][e].k[ii] *
+		        E->elt_k[level][e].k[ii] *
 			u[E->ID[level][nodeb].doff[1]]
-		      + E->elt_k[level][CPPR][e].k[ii+1] *
+		      + E->elt_k[level][e].k[ii+1] *
 			u[E->ID[level][nodeb].doff[2]]
-		      + E->elt_k[level][CPPR][e].k[ii+2] *
+		      + E->elt_k[level][e].k[ii+2] *
 			u[E->ID[level][nodeb].doff[3]];
 		/* i=2, j=1,2,3 */
 		Au[a2] +=
-		        E->elt_k[level][CPPR][e].k[ii+n] *
+		        E->elt_k[level][e].k[ii+n] *
 			u[E->ID[level][nodeb].doff[1]]
-		      + E->elt_k[level][CPPR][e].k[ii+n+1] *
+		      + E->elt_k[level][e].k[ii+n+1] *
 			u[E->ID[level][nodeb].doff[2]]
-		      + E->elt_k[level][CPPR][e].k[ii+n+2] *
+		      + E->elt_k[level][e].k[ii+n+2] *
 			u[E->ID[level][nodeb].doff[3]];
 		/* i=3, j=1,2,3 */
 		Au[a3] +=
-		        E->elt_k[level][CPPR][e].k[ii+n+n] *
+		        E->elt_k[level][e].k[ii+n+n] *
 			u[E->ID[level][nodeb].doff[1]]
-		      + E->elt_k[level][CPPR][e].k[ii+n+n+1] *
+		      + E->elt_k[level][e].k[ii+n+n+1] *
 			u[E->ID[level][nodeb].doff[2]]
-		      + E->elt_k[level][CPPR][e].k[ii+n+n+2] *
+		      + E->elt_k[level][e].k[ii+n+n+2] *
 			u[E->ID[level][nodeb].doff[3]];
 
  	    }         /* end for loop b */
diff --git a/lib/global_defs.h b/lib/global_defs.h
index eb754db..d00f766 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -807,7 +807,7 @@ struct All_variables {
     struct SUBEL *EL[MAX_LEVELS];
     struct EG *elt_del[MAX_LEVELS];
     struct EC *elt_c[MAX_LEVELS];
-    struct EK *elt_k[MAX_LEVELS][NCS];
+    struct EK *elt_k[MAX_LEVELS];
     struct CC *cc;
     struct CCX *ccx;
     struct CC *CC[MAX_LEVELS][NCS];