[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->sphere.area and E->sphere.area1 as part of caps_per_proc_removal (8d1e7ae)

[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 8d1e7aec7f55189989d5daed0a853253358e7b22
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Sep 24 14:15:41 2014 -0700

    Changed the shape of E->sphere.area and E->sphere.area1 as part of caps_per_proc_removal


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

8d1e7aec7f55189989d5daed0a853253358e7b22
 lib/Instructions.c | 2 +-
 lib/Sphere_util.c  | 4 ++--
 lib/global_defs.h  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Instructions.c b/lib/Instructions.c
index 6f2ca76..c5db231 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1025,7 +1025,7 @@ void allocate_common_vars(E)
 
     E->IEN[i] = (struct IEN *)   malloc((nel+2)*sizeof(struct IEN));
     E->EL[i]  = (struct SUBEL *) malloc((nel+2)*sizeof(struct SUBEL));
-    E->sphere.area1[i][CPPR] = (double *) malloc((snel+1)*sizeof(double));
+    E->sphere.area1[i] = (double *) malloc((snel+1)*sizeof(double));
     for (k=1;k<=4;k++)
       E->sphere.angle1[i][CPPR][k] = (double *) malloc((snel+1)*sizeof(double));
 
diff --git a/lib/Sphere_util.c b/lib/Sphere_util.c
index cb67a6c..081e583 100644
--- a/lib/Sphere_util.c
+++ b/lib/Sphere_util.c
@@ -88,7 +88,7 @@ void compute_angle_surf_area (E)
         for (i=1;i<=4;i++)         /* angle1: bet 1 & 2; angle2: bet 2 & 3 ..*/
             E->sphere.angle[CPPR][i] = angle[i];
 
-        E->sphere.area[CPPR] = area_sphere_cap(angle);
+        E->sphere.area = area_sphere_cap(angle);
 
         for (lev=E->mesh.levmax;lev>=E->mesh.levmin;lev--)
             for (es=1;es<=E->lmesh.SNEL[lev];es++)              {
@@ -107,7 +107,7 @@ void compute_angle_surf_area (E)
                 for (i=1;i<=4;i++)         /* angle1: bet 1 & 2; angle2: bet 2 & 3 ..*/
                     E->sphere.angle1[lev][CPPR][i][es] = angle[i];
 
-                E->sphere.area1[lev][CPPR][es] = area_sphere_cap(angle);
+                E->sphere.area1[lev][es] = area_sphere_cap(angle);
 
             }  /* end for lev and es */
 }
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 3c99603..9784fa5 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -286,9 +286,9 @@ struct SPHERE   {
   double **tablescosf;
   double **tablessinf;
 
-  double area[NCS];
+  double area;
   double angle[NCS][5];
-  double *area1[MAX_LEVELS][NCS];
+  double *area1[MAX_LEVELS];
   double *angle1[MAX_LEVELS][NCS][5];
 
   double *R[MAX_LEVELS];