[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->CCX as part of caps_per_proc removal (980de67)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/citcoms

On branch  : rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/3dd353175e1585eede6efdf2fa8a1f395160e481...980de677d7efb78fdd5c41fd4b35a9283a2d251f

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

commit 980de677d7efb78fdd5c41fd4b35a9283a2d251f
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Tue Sep 23 18:45:41 2014 -0700

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


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

980de677d7efb78fdd5c41fd4b35a9283a2d251f
 lib/Instructions.c     | 4 ++--
 lib/Size_does_matter.c | 8 ++++----
 lib/global_defs.h      | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Instructions.c b/lib/Instructions.c
index a2b1e3b..147362f 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1063,7 +1063,7 @@ void allocate_common_vars(E)
 
     nxyz = elx*ely;
     E->CC[i] =(struct CC *)  malloc((1)*sizeof(struct CC));
-    E->CCX[i][CPPR]=(struct CCX *)  malloc((1)*sizeof(struct CCX));
+    E->CCX[i]=(struct CCX *)  malloc((1)*sizeof(struct CCX));
 
     E->elt_del[i] = (struct EG *) malloc((nel+1)*sizeof(struct EG));
 
@@ -1358,7 +1358,7 @@ void set_up_nonmg_aliases(struct All_variables *E)
   E->EVi = E->EVI[E->mesh.levmax];
   E->node = E->NODE[E->mesh.levmax];
   E->cc = E->CC[E->mesh.levmax];
-  E->ccx = E->CCX[E->mesh.levmax][CPPR];
+  E->ccx = E->CCX[E->mesh.levmax];
   E->Mass = E->MASS[E->mesh.levmax];
   E->gDA = E->GDA[E->mesh.levmax];
   E->gNX = E->GNX[E->mesh.levmax];
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index d0d9a5f..df50a01 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -866,9 +866,9 @@ void construct_c3x3matrix(E)
             for (j=1;j<=dims;j++)   {
               E->CC[lev][es].vpt[BVINDEX(i,j,a,k)] =
                     ua[j][1]*u[i][1]+ua[j][2]*u[i][2]+ua[j][3]*u[i][3];
-              E->CCX[lev][CPPR][es].vpt[BVXINDEX(i,j,1,a,k)] =
+              E->CCX[lev][es].vpt[BVXINDEX(i,j,1,a,k)] =
                     ua[j][1]*ux[1][i][1]+ua[j][2]*ux[1][i][2]+ua[j][3]*ux[1][i][3];
-              E->CCX[lev][CPPR][es].vpt[BVXINDEX(i,j,2,a,k)] =
+              E->CCX[lev][es].vpt[BVXINDEX(i,j,2,a,k)] =
                     ua[j][1]*ux[2][i][1]+ua[j][2]*ux[2][i][2]+ua[j][3]*ux[2][i][3];
               }
           }      /* end for local node */
@@ -925,9 +925,9 @@ void construct_c3x3matrix(E)
             for (j=1;j<=dims;j++)   {
               E->CC[lev][es].ppt[BPINDEX(i,j,a,k)] =
                     ua[j][1]*u[i][1]+ua[j][2]*u[i][2]+ua[j][3]*u[i][3];
-              E->CCX[lev][CPPR][es].ppt[BPXINDEX(i,j,1,a,k)] =
+              E->CCX[lev][es].ppt[BPXINDEX(i,j,1,a,k)] =
                     ua[j][1]*ux[1][i][1]+ua[j][2]*ux[1][i][2]+ua[j][3]*ux[1][i][3];
-              E->CCX[lev][CPPR][es].ppt[BPXINDEX(i,j,2,a,k)] =
+              E->CCX[lev][es].ppt[BPXINDEX(i,j,2,a,k)] =
                     ua[j][1]*ux[2][i][1]+ua[j][2]*ux[2][i][2]+ua[j][3]*ux[2][i][3];
               }
 
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 63b4240..5eafb74 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -811,7 +811,7 @@ struct All_variables {
     struct CC *cc;
     struct CCX *ccx;
     struct CC *CC[MAX_LEVELS];
-    struct CCX *CCX[MAX_LEVELS][NCS];
+    struct CCX *CCX[MAX_LEVELS];
 
     struct CC element_Cc;
     struct CCX element_Ccx;