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

[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 5e4ac762ec270aa6992a7bd84a5321b9fd366db0
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Tue Sep 23 16:46:32 2014 -0700

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


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

5e4ac762ec270aa6992a7bd84a5321b9fd366db0
 lib/Advection_diffusion.c  | 4 ++--
 lib/Instructions.c         | 2 +-
 lib/Process_buoyancy.c     | 2 +-
 lib/Topo_gravity.c         | 2 +-
 lib/Viscosity_structures.c | 2 +-
 lib/global_defs.h          | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/Advection_diffusion.c b/lib/Advection_diffusion.c
index 70dce59..7eaa9ea 100644
--- a/lib/Advection_diffusion.c
+++ b/lib/Advection_diffusion.c
@@ -380,8 +380,8 @@ static void pg_solver(struct All_variables *E,
       get_rtf_at_vpts(E, lev, el, rtf);
 
       /* XXX: replace diff with refstate.thermal_conductivity */
-      pg_shape_fn(E, el, &PG, &(E->gNX[CPPR][el]), VV, rtf, diff);
-      element_residual(E, el, &PG, &(E->gNX[CPPR][el]), &(E->gDA[CPPR][el]),
+      pg_shape_fn(E, el, &PG, &(E->gNX[el]), VV, rtf, diff);
+      element_residual(E, el, &PG, &(E->gNX[el]), &(E->gDA[CPPR][el]),
                        VV, T, Tdot,
                        Q0, Eres, rtf, diff, E->sphere.cap[CPPR].TB,
                        FLAGS);
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 7affade..b0b812f 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1361,7 +1361,7 @@ void set_up_nonmg_aliases(struct All_variables *E)
   E->ccx = E->CCX[E->mesh.levmax][CPPR];
   E->Mass = E->MASS[E->mesh.levmax];
   E->gDA[CPPR] = E->GDA[E->mesh.levmax];
-  E->gNX[CPPR] = E->GNX[E->mesh.levmax];
+  E->gNX = E->GNX[E->mesh.levmax];
 
   for (i=1;i<=E->mesh.nsd;i++)    {
     E->x[i] = E->X[E->mesh.levmax][i];
diff --git a/lib/Process_buoyancy.c b/lib/Process_buoyancy.c
index 1f54082..4c56bde 100644
--- a/lib/Process_buoyancy.c
+++ b/lib/Process_buoyancy.c
@@ -94,7 +94,7 @@ void heat_flux(E)
           rho[i] += E->refstate.rho[nz]*E->N.vpt[GNVINDEX(j,i)];
           u[i] += VV[3][j]*E->N.vpt[GNVINDEX(j,i)];
           T[i] += E->T[E->ien[e].node[j]]*E->N.vpt[GNVINDEX(j,i)];
-          dTdz[i] += -E->T[E->ien[e].node[j]]*E->gNX[CPPR][e].vpt[GNVXINDEX(2,j,i)];
+          dTdz[i] += -E->T[E->ien[e].node[j]]*E->gNX[e].vpt[GNVXINDEX(2,j,i)];
           }
         }
 
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 4053e3a..25bc039 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -212,7 +212,7 @@ void compute_nodal_stress(struct All_variables *E,
 						 local to the
 						 element */
       dOmega = &(E->gDA[CPPR][e]);	/* Jacobian at integration points */
-      GNx = &(E->gNX[CPPR][e]);	/* derivatives of shape functions at
+      GNx = &(E->gNX[e]);	/* derivatives of shape functions at
 				   integration points */
 
       for(j=1;j <= vpts;j++)  {	/* loop through velocity Gauss points  */
diff --git a/lib/Viscosity_structures.c b/lib/Viscosity_structures.c
index bd342ec..aa5df5c 100644
--- a/lib/Viscosity_structures.c
+++ b/lib/Viscosity_structures.c
@@ -1134,7 +1134,7 @@ void strain_rate_2_inv(E,EEDOT,SQRT)
         get_rtf_at_ppts(E, lev, e, rtf); /* pressure evaluation
 					       points */
         velo_from_element(E, VV, e, sphere_key);
-        GNx = &(E->gNX[CPPR][e]);
+        GNx = &(E->gNX[e]);
 
         theta = rtf[1][1];
 
diff --git a/lib/global_defs.h b/lib/global_defs.h
index c0724c3..932e913 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -870,7 +870,7 @@ struct All_variables {
 
     struct Shape_function_dx *GNX[MAX_LEVELS];
     struct Shape_function_dA *GDA[MAX_LEVELS];
-    struct Shape_function_dx *gNX[NCS];
+    struct Shape_function_dx *gNX;
     struct Shape_function_dA *gDA[NCS];
 
     struct Shape_function1 M; /* master-element shape funtions */