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

[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 7ee618e95e3b8ae565cc76c679f966b51ad4e741
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Tue Sep 23 15:55:52 2014 -0700

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


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

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

diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index ed42667..039d7f6 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -298,7 +298,7 @@ void construct_surf_det (E)
   double xx[4][5], dxda[4][4], r2;
 
     for(k=1;k<=oned;k++)    { /* all of the vpoints*/
-      E->surf_det[CPPR][k] = (double *)malloc((1+E->lmesh.snel)*sizeof(double));
+      E->surf_det[k] = (double *)malloc((1+E->lmesh.snel)*sizeof(double));
     }
 
   r2 = 1.0 / (E->sx[3][E->lmesh.elz+1] * E->sx[3][E->lmesh.elz+1]);
@@ -320,7 +320,7 @@ void construct_surf_det (E)
       jacobian = determinant(dxda,E->mesh.nsd-1);
 
       /* scale the jacobian so that it is defined on a unit sphere */
-      E->surf_det[CPPR][k][es] = jacobian * r2;
+      E->surf_det[k][es] = jacobian * r2;
       }
     }
 }
diff --git a/lib/Sphere_harmonics.c b/lib/Sphere_harmonics.c
index b798f14..efe2703 100644
--- a/lib/Sphere_harmonics.c
+++ b/lib/Sphere_harmonics.c
@@ -124,12 +124,12 @@ void sphere_expansion(E,TG,sphc,sphs)
                                 * E->sphere.tablesplm[CPPR][j][p]
                                 * E->sphere.tablescosf[CPPR][j][mm]
                                 * E->M.vpt[GMVINDEX(d,nint)]
-                                * E->surf_det[CPPR][nint][es];
+                                * E->surf_det[nint][es];
                             sphs[p] += TG[E->sien[es].node[d]]
                                 * E->sphere.tablesplm[CPPR][j][p]
                                 * E->sphere.tablessinf[CPPR][j][mm]
                                 * E->M.vpt[GMVINDEX(d,nint)]
-                                * E->surf_det[CPPR][nint][es];
+                                * E->surf_det[nint][es];
                         }
                     }
 
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 53d7397..c925dec 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -837,7 +837,7 @@ struct All_variables {
     double *TMass, *NMass;
     double *SX[MAX_LEVELS][4],*X[MAX_LEVELS][4];
     double *sx[4],*x[4];
-    double *surf_det[NCS][5];
+    double *surf_det[5];
     double *SinCos[MAX_LEVELS][NCS][4];
 
     float *NP;