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

[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 ea783f7bcf72611c679d94d92b90df207e755790
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Tue Sep 23 18:42:25 2014 -0700

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


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

ea783f7bcf72611c679d94d92b90df207e755790
 lib/Instructions.c     | 4 ++--
 lib/Size_does_matter.c | 4 ++--
 lib/global_defs.h      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Instructions.c b/lib/Instructions.c
index 491ccae..a2b1e3b 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1062,7 +1062,7 @@ void allocate_common_vars(E)
     ely = E->lmesh.ELY[i];
 
     nxyz = elx*ely;
-    E->CC[i][CPPR] =(struct CC *)  malloc((1)*sizeof(struct CC));
+    E->CC[i] =(struct CC *)  malloc((1)*sizeof(struct CC));
     E->CCX[i][CPPR]=(struct CCX *)  malloc((1)*sizeof(struct CCX));
 
     E->elt_del[i] = (struct EG *) malloc((nel+1)*sizeof(struct EG));
@@ -1357,7 +1357,7 @@ void set_up_nonmg_aliases(struct All_variables *E)
   E->Vi = E->VI[E->mesh.levmax];
   E->EVi = E->EVI[E->mesh.levmax];
   E->node = E->NODE[E->mesh.levmax];
-  E->cc = E->CC[E->mesh.levmax][CPPR];
+  E->cc = E->CC[E->mesh.levmax];
   E->ccx = E->CCX[E->mesh.levmax][CPPR];
   E->Mass = E->MASS[E->mesh.levmax];
   E->gDA = E->GDA[E->mesh.levmax];
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index 60ed1d3..d0d9a5f 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -864,7 +864,7 @@ void construct_c3x3matrix(E)
 
           for (i=1;i<=dims;i++)
             for (j=1;j<=dims;j++)   {
-              E->CC[lev][CPPR][es].vpt[BVINDEX(i,j,a,k)] =
+              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)] =
                     ua[j][1]*ux[1][i][1]+ua[j][2]*ux[1][i][2]+ua[j][3]*ux[1][i][3];
@@ -923,7 +923,7 @@ void construct_c3x3matrix(E)
 
           for (i=1;i<=dims;i++)
             for (j=1;j<=dims;j++)   {
-              E->CC[lev][CPPR][es].ppt[BPINDEX(i,j,a,k)] =
+              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)] =
                     ua[j][1]*ux[1][i][1]+ua[j][2]*ux[1][i][2]+ua[j][3]*ux[1][i][3];
diff --git a/lib/global_defs.h b/lib/global_defs.h
index d00f766..63b4240 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -810,7 +810,7 @@ struct All_variables {
     struct EK *elt_k[MAX_LEVELS];
     struct CC *cc;
     struct CCX *ccx;
-    struct CC *CC[MAX_LEVELS][NCS];
+    struct CC *CC[MAX_LEVELS];
     struct CCX *CCX[MAX_LEVELS][NCS];
 
     struct CC element_Cc;