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

[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 de15836753259c80b284aaa8fc8d0b3e027351e2
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Tue Sep 23 13:46:45 2014 -0700

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


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

de15836753259c80b284aaa8fc8d0b3e027351e2
 lib/Advection_diffusion.c | 2 +-
 lib/Instructions.c        | 2 +-
 lib/Topo_gravity.c        | 2 +-
 lib/global_defs.h         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Advection_diffusion.c b/lib/Advection_diffusion.c
index 6c53adc..45ecd41 100644
--- a/lib/Advection_diffusion.c
+++ b/lib/Advection_diffusion.c
@@ -735,7 +735,7 @@ static void process_visc_heating(struct All_variables *E, double *heating)
     for(e=1; e<=E->lmesh.nel; e++) {
         visc = 0.0;
         for(i = 1; i <= vpts; i++)
-            visc += E->EVi[CPPR][(e-1)*vpts + i];
+            visc += E->EVi[(e-1)*vpts + i];
 
         heating[e] = temp * visc * strain_sqr[e];
     }
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 7483d90..b0e7314 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1355,7 +1355,7 @@ void set_up_nonmg_aliases(struct All_variables *E)
   E->ien = E->IEN[E->mesh.levmax][CPPR];
   E->id = E->ID[E->mesh.levmax][CPPR];
   E->Vi = E->VI[E->mesh.levmax];
-  E->EVi[CPPR] = E->EVI[E->mesh.levmax];
+  E->EVi = E->EVI[E->mesh.levmax];
   E->node[CPPR] = E->NODE[E->mesh.levmax][CPPR];
   E->cc = E->CC[E->mesh.levmax][CPPR];
   E->ccx = E->CCX[E->mesh.levmax][CPPR];
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 9f91a26..0f17ae8 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -217,7 +217,7 @@ void compute_nodal_stress(struct All_variables *E,
 
       for(j=1;j <= vpts;j++)  {	/* loop through velocity Gauss points  */
 	/* E->EVi[j] = E->EVI[E->mesh.levmax][j]; */
-        pre[j] =  E->EVi[CPPR][(e-1)*vpts+j]*dOmega->vpt[j];
+        pre[j] =  E->EVi[(e-1)*vpts+j]*dOmega->vpt[j];
         dilation[j] = 0.0;
         Vxyz[1][j] = 0.0;
         Vxyz[2][j] = 0.0;
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 924ac15..f7769a3 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -846,7 +846,7 @@ struct All_variables {
     float *Fas670[NCS],*Fas410[NCS],*Fas670_b[NCS],*Fas410_b[NCS];
     float *Fascmb[NCS],*Fascmb_b[NCS];
 
-    float *Vi,*EVi[NCS];
+    float *Vi,*EVi;
     float *VI[MAX_LEVELS],*EVI[MAX_LEVELS];
 
 #ifdef CITCOM_ALLOW_ANISOTROPIC_VISC