[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->tablescosf as part of caps_per_proc_removal (7f3f5e0)

[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 7f3f5e060b8ceeab03697edaf510a1aec67f345d
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Sep 24 14:08:29 2014 -0700

    Changed the shape of E->tablescosf as part of caps_per_proc_removal


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

7f3f5e060b8ceeab03697edaf510a1aec67f345d
 lib/Sphere_harmonics.c | 8 ++++----
 lib/global_defs.h      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Sphere_harmonics.c b/lib/Sphere_harmonics.c
index 704184b..09e77d5 100644
--- a/lib/Sphere_harmonics.c
+++ b/lib/Sphere_harmonics.c
@@ -122,7 +122,7 @@ void sphere_expansion(E,TG,sphc,sphs)
                             j = E->sien[es].node[d];
                             sphc[p] += TG[E->sien[es].node[d]]
                                 * E->sphere.tablesplm[j][p]
-                                * E->sphere.tablescosf[CPPR][j][mm]
+                                * E->sphere.tablescosf[j][mm]
                                 * E->M.vpt[GMVINDEX(d,nint)]
                                 * E->surf_det[nint][es];
                             sphs[p] += TG[E->sien[es].node[d]]
@@ -194,12 +194,12 @@ static void  compute_sphereh_table(E)
     
 
         E->sphere.tablesplm   = (double **) malloc((E->lmesh.nsf+1)*sizeof(double*));
-        E->sphere.tablescosf[CPPR] = (double **) malloc((E->lmesh.nsf+1)*sizeof(double*));
+        E->sphere.tablescosf = (double **) malloc((E->lmesh.nsf+1)*sizeof(double*));
         E->sphere.tablessinf[CPPR] = (double **) malloc((E->lmesh.nsf+1)*sizeof(double*));
 
         for (i=1;i<=E->lmesh.nsf;i++)   {
             E->sphere.tablesplm[i]= (double *)malloc((E->sphere.hindice)*sizeof(double));
-            E->sphere.tablescosf[CPPR][i]= (double *)malloc((E->output.llmax+1)*sizeof(double));
+            E->sphere.tablescosf[i]= (double *)malloc((E->output.llmax+1)*sizeof(double));
             E->sphere.tablessinf[CPPR][i]= (double *)malloc((E->output.llmax+1)*sizeof(double));
         }
 
@@ -209,7 +209,7 @@ static void  compute_sphereh_table(E)
             t=E->sx[1][node];
             for (mm=0;mm<=E->output.llmax;mm++)   {
 	      mmf = (double)(mm)*f;
-                E->sphere.tablescosf[CPPR][j][mm] = cos( mmf );
+                E->sphere.tablescosf[j][mm] = cos( mmf );
                 E->sphere.tablessinf[CPPR][j][mm] = sin( mmf );
             }
 
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 4f6e92f..c64872a 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -283,7 +283,7 @@ struct SPHERE   {
   float *harm_tpgb[2];
 
   double **tablesplm;
-  double **tablescosf[NCS];
+  double **tablescosf;
   double **tablessinf[NCS];
 
   double area[NCS];