[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->sphere.angle and E->sphere.angle1 as part of caps_per_proc_removal (92578b2)

[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 92578b2c85837ed13be8920e9cc1ebc652ded684
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Wed Sep 24 14:18:55 2014 -0700

    Changed the shape of E->sphere.angle and E->sphere.angle1 as part of caps_per_proc_removal


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

92578b2c85837ed13be8920e9cc1ebc652ded684
 lib/Instructions.c | 2 +-
 lib/Sphere_util.c  | 6 +++---
 lib/global_defs.h  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Instructions.c b/lib/Instructions.c
index c5db231..62387e7 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1027,7 +1027,7 @@ void allocate_common_vars(E)
     E->EL[i]  = (struct SUBEL *) malloc((nel+2)*sizeof(struct SUBEL));
     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));
+      E->sphere.angle1[i][k] = (double *) malloc((snel+1)*sizeof(double));
 
     E->GNX[i] = (struct Shape_function_dx *)malloc((nel+1)*sizeof(struct Shape_function_dx));
     E->GDA[i] = (struct Shape_function_dA *)malloc((nel+1)*sizeof(struct Shape_function_dA));
diff --git a/lib/Sphere_util.c b/lib/Sphere_util.c
index 081e583..f4312a7 100644
--- a/lib/Sphere_util.c
+++ b/lib/Sphere_util.c
@@ -86,7 +86,7 @@ void compute_angle_surf_area (E)
         get_angle_sphere_cap(xx,angle);
 
         for (i=1;i<=4;i++)         /* angle1: bet 1 & 2; angle2: bet 2 & 3 ..*/
-            E->sphere.angle[CPPR][i] = angle[i];
+            E->sphere.angle[i] = angle[i];
 
         E->sphere.area = area_sphere_cap(angle);
 
@@ -105,7 +105,7 @@ void compute_angle_surf_area (E)
                 get_angle_sphere_cap(xx,angle);
 
                 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.angle1[lev][i][es] = angle[i];
 
                 E->sphere.area1[lev][es] = area_sphere_cap(angle);
 
@@ -187,7 +187,7 @@ double area_of_5points(E,lev,el,x,ne)
         xx[2] = E->X[lev][2][ia[i]]/E->SX[lev][3][ia[1]];
         xx[3] = E->X[lev][3][ia[i]]/E->SX[lev][3][ia[1]];
         angle[i] = get_angle(x,xx);  /* get angle bet (i,j) and other four*/
-        angle1[i]= E->sphere.angle1[lev][CPPR][i][es];
+        angle1[i]= E->sphere.angle1[lev][i][es];
     }
 
     area1 = area_of_sphere_triag(angle[1],angle[2],angle1[1])
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 9784fa5..2121cc9 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -287,9 +287,9 @@ struct SPHERE   {
   double **tablessinf;
 
   double area;
-  double angle[NCS][5];
+  double angle[5];
   double *area1[MAX_LEVELS];
-  double *angle1[MAX_LEVELS][NCS][5];
+  double *angle1[MAX_LEVELS][5];
 
   double *R[MAX_LEVELS];
   double *gr;