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

[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 3ea8f8c8ec15cef7409f256c86e95c0e83cc401c
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Tue Sep 23 17:57:53 2014 -0700

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


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

3ea8f8c8ec15cef7409f256c86e95c0e83cc401c
 lib/Construct_arrays.c |  2 +-
 lib/Instructions.c     |  2 +-
 lib/Solver_multigrid.c | 14 +++++++-------
 lib/global_defs.h      |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index 767ac10..b2f5ac7 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -587,7 +587,7 @@ void construct_sub_element(E)
 		  eltu = (j*2-1) + elzu *2*(i-1) + elxu*elzu*2*(k-1);
 
 		  for(l=1;l<=enodes[E->mesh.nsd];l++)   {
-		      E->EL[lev][CPPR][elt].sub[l] = eltu
+		      E->EL[lev][elt].sub[l] = eltu
                                  + offset[l].vector[0]
                                  + offset[l].vector[1] * elzu
                                  + offset[l].vector[2] * elzu * elxu;
diff --git a/lib/Instructions.c b/lib/Instructions.c
index d501aee..36472cb 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1024,7 +1024,7 @@ void allocate_common_vars(E)
       E->SinCos[i][d]  = (double *)  malloc((nno+1)*sizeof(double));
 
     E->IEN[i] = (struct IEN *)   malloc((nel+2)*sizeof(struct IEN));
-    E->EL[i][CPPR]  = (struct SUBEL *) malloc((nel+2)*sizeof(struct SUBEL));
+    E->EL[i]  = (struct SUBEL *) malloc((nel+2)*sizeof(struct SUBEL));
     E->sphere.area1[i][CPPR] = (double *) malloc((snel+1)*sizeof(double));
     for (k=1;k<=4;k++)
       E->sphere.angle1[i][CPPR][k] = (double *) malloc((snel+1)*sizeof(double));
diff --git a/lib/Solver_multigrid.c b/lib/Solver_multigrid.c
index 53583a6..c4e61f3 100644
--- a/lib/Solver_multigrid.c
+++ b/lib/Solver_multigrid.c
@@ -79,7 +79,7 @@ void inject_scalar(E,start_lev,AU,AD)
       for(el=1;el<=E->lmesh.NEL[sl_minus];el++)
         for(i=1;i<=ends;i++)       {
           node_coarse = E->IEN[sl_minus][el].node[i];
-          node_fine=E->IEN[start_lev][E->EL[sl_minus][CPPR][el].sub[i]].node[i];
+          node_fine=E->IEN[start_lev][E->EL[sl_minus][el].sub[i]].node[i];
           AD[node_coarse] = AU[node_fine];
         }
 }
@@ -107,7 +107,7 @@ void inject_vector(E,start_lev,AU,AD)
       for(el=1;el<=E->lmesh.NEL[sl_minus];el++)
         for(i=1;i<=ends;i++)       {
           node_coarse = E->IEN[sl_minus][el].node[i];
-          node_fine=E->IEN[start_lev][E->EL[sl_minus][CPPR][el].sub[i]].node[i];
+          node_fine=E->IEN[start_lev][E->EL[sl_minus][el].sub[i]].node[i];
           for (j=1;j<=dims;j++)    {
             eqn_fine   = E->ID[start_lev][node_fine].doff[j];
             eqn_coarse = E->ID[sl_minus][node_coarse].doff[j];
@@ -148,7 +148,7 @@ void un_inject_vector(E,start_lev,AD,AU)
       for(el=1;el<=nels;el++)
         for(i=1;i<=ENODES3D;i++)  {
           node = E->IEN[start_lev][el].node[i];
-	  node_plus=E->IEN[sl_plus][E->EL[start_lev][CPPR][el].sub[i]].node[i];
+	  node_plus=E->IEN[sl_plus][E->EL[start_lev][el].sub[i]].node[i];
 
 	  eqn1 = E->ID[start_lev][node].doff[1];
 	  eqn2 = E->ID[start_lev][node].doff[2];
@@ -382,7 +382,7 @@ void inject_scalar_e(E,start_lev,AU,AD)
 
         for(el=1;el<=nels_minus;el++)
             for(i=1;i<=ENODES3D;i++)                {
-                e = E->EL[sl_minus][CPPR][el].sub[i];
+                e = E->EL[sl_minus][el].sub[i];
                 AD[(el-1)*vpts+i] = AU[e];
                 }
 }
@@ -415,7 +415,7 @@ void project_scalar_e(E,start_lev,AU,AD)
     for(el=1;el<=nels_minus;el++)    {
         average=0.0;
         for(i=1;i<=ENODES3D;i++) {
-            e = E->EL[sl_minus][CPPR][el].sub[i];
+            e = E->EL[sl_minus][el].sub[i];
             average += AU[e];
             }
 
@@ -449,7 +449,7 @@ void project_scalar(E,start_lev,AU,AD)
         for(el=1;el<=nels_minus;el++)
             for(i=1;i<=ENODES3D;i++) {
                 average=0.0;
-                node1 = E->EL[sl_minus][CPPR][el].sub[i];
+                node1 = E->EL[sl_minus][el].sub[i];
                 for(j=1;j<=ENODES3D;j++)                     {
                     node=E->IEN[start_lev][node1].node[j];
                     average += AU[node];
@@ -515,7 +515,7 @@ void project_vector(E,start_lev,AU,AD,ic)
           for(i=1;i<=ENODES3D;i++) {
                 node= E->IEN[sl_minus][el].node[i];
 		average1=average2=average3=0.0;
-		e1 = E->EL[sl_minus][CPPR][el].sub[i];
+		e1 = E->EL[sl_minus][el].sub[i];
 		for(j=1;j<=ENODES3D;j++) {
 		    node1=E->IEN[start_lev][e1].node[j];
 		    average1 += E->temp[E->ID[start_lev][node1].doff[1]];
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 6c3df0a..94dd7f8 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -804,7 +804,7 @@ struct All_variables {
     struct IEN *IEN[MAX_LEVELS]; /* global at each level */
     struct FNODE *TWW[MAX_LEVELS];	/* for nodal averages */
     struct ID *ID[MAX_LEVELS];
-    struct SUBEL *EL[MAX_LEVELS][NCS];
+    struct SUBEL *EL[MAX_LEVELS];
     struct EG *elt_del[MAX_LEVELS][NCS];
     struct EC *elt_c[MAX_LEVELS][NCS];
     struct EK *elt_k[MAX_LEVELS][NCS];