[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->tablesplm as part of caps_per_proc_removal (2f6a5c8)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Nov 5 19:14:08 PST 2014


Repository : https://github.com/geodynamics/citcoms

On branch  : rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

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

commit 2f6a5c80df5b2d9215133499e5aa15ee1b4dd3f8
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Sep 24 14:06:06 2014 -0700

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


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

2f6a5c80df5b2d9215133499e5aa15ee1b4dd3f8
 lib/Sphere_harmonics.c | 10 +++++-----
 lib/global_defs.h      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Sphere_harmonics.c b/lib/Sphere_harmonics.c
index efe2703..704184b 100644
--- a/lib/Sphere_harmonics.c
+++ b/lib/Sphere_harmonics.c
@@ -121,12 +121,12 @@ void sphere_expansion(E,TG,sphc,sphs)
                         for(d=1;d<=onedvpoints[E->mesh.nsd];d++)   {
                             j = E->sien[es].node[d];
                             sphc[p] += TG[E->sien[es].node[d]]
-                                * E->sphere.tablesplm[CPPR][j][p]
+                                * E->sphere.tablesplm[j][p]
                                 * E->sphere.tablescosf[CPPR][j][mm]
                                 * E->M.vpt[GMVINDEX(d,nint)]
                                 * E->surf_det[nint][es];
                             sphs[p] += TG[E->sien[es].node[d]]
-                                * E->sphere.tablesplm[CPPR][j][p]
+                                * E->sphere.tablesplm[j][p]
                                 * E->sphere.tablessinf[CPPR][j][mm]
                                 * E->M.vpt[GMVINDEX(d,nint)]
                                 * E->surf_det[nint][es];
@@ -193,12 +193,12 @@ static void  compute_sphereh_table(E)
     double t,f,mmf;
     
 
-        E->sphere.tablesplm[CPPR]   = (double **) malloc((E->lmesh.nsf+1)*sizeof(double*));
+        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.tablessinf[CPPR] = (double **) malloc((E->lmesh.nsf+1)*sizeof(double*));
 
         for (i=1;i<=E->lmesh.nsf;i++)   {
-            E->sphere.tablesplm[CPPR][i]= (double *)malloc((E->sphere.hindice)*sizeof(double));
+            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.tablessinf[CPPR][i]= (double *)malloc((E->output.llmax+1)*sizeof(double));
         }
@@ -216,7 +216,7 @@ static void  compute_sphereh_table(E)
             for (ll=0;ll<=E->output.llmax;ll++)
                 for (mm=0;mm<=ll;mm++)  {
                     p = E->sphere.hindex[ll][mm];
-                    E->sphere.tablesplm[CPPR][j][p] = modified_plgndr_a(ll,mm,t) ;
+                    E->sphere.tablesplm[j][p] = modified_plgndr_a(ll,mm,t) ;
                 }
         }
 }
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 12408b0..4f6e92f 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -282,7 +282,7 @@ struct SPHERE   {
   float *harm_tpgt[2];
   float *harm_tpgb[2];
 
-  double **tablesplm[NCS];
+  double **tablesplm;
   double **tablescosf[NCS];
   double **tablessinf[NCS];
 



More information about the CIG-COMMITS mailing list