[cig-commits] [commit] rajesh-petsc-schur: Changed the shapes of E->boundary.element as part of caps_per_proc removal (e695656)

[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 e69565685d58faacbb00052d33cab6fc8b4b1f65
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 25 14:31:23 2014 -0700

    Changed the shapes of E->boundary.element as part of caps_per_proc removal


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

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

diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index c38b8ac..90179af 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -1116,7 +1116,7 @@ static void get_elt_tr(struct All_variables *E, int bel, int side, double elt_tr
 					tmp += traction_at_gs[b][k] * Cc.vpt[BVINDEX(b,d,a,k)];
 
 				elt_tr[p] += tmp * E->M.vpt[GMVINDEX(j,k)]
-					* E->boundary.det[CPPR][side][k][bel] * g_1d[k].weight[dims-1];
+					* E->boundary.det[side][k][bel] * g_1d[k].weight[dims-1];
 
 			}
 		}
@@ -1218,7 +1218,7 @@ static void get_elt_tr_pseudo_surf(struct All_variables *E, int bel, int side, d
 					tmp += traction_at_gs[b][k] * Cc.vpt[BVINDEX(b,d,a,k)];
 
 				elt_tr[p] += tmp * E->M.vpt[GMVINDEX(j,k)]
-					* E->boundary.det[CPPR][side][k][bel] * g_1d[k].weight[dims-1];
+					* E->boundary.det[side][k][bel] * g_1d[k].weight[dims-1];
 
 			}
 		}
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index 7770f87..5708e02 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -345,7 +345,7 @@ void construct_bdry_det(struct All_variables *E)
 
     for (side=SIDE_BEGIN; side<=SIDE_END; side++)
       for(d=1; d<=oned; d++)
-	E->boundary.det[CPPR][side][d] = (double *)malloc((1+E->boundary.nel)*sizeof(double));
+	E->boundary.det[side][d] = (double *)malloc((1+E->boundary.nel)*sizeof(double));
 
     for (es=1;es<=E->boundary.nel;es++) {
       el = E->boundary.element[es];
@@ -365,7 +365,7 @@ void construct_bdry_det(struct All_variables *E)
 		dxda[d][e] += xx[sidedim[side][e]][i]*E->Mx.vpt[GMVXINDEX(d-1,i,k)];
 
 	  jacobian = determinant(dxda,E->mesh.nsd-1);
-	  E->boundary.det[CPPR][side][k][es] = jacobian;
+	  E->boundary.det[side][k][es] = jacobian;
 	}
 
       }
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 4b32d50..feedcb1 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -128,7 +128,7 @@ struct Bdry {
   int nel;
   int *element;
   int *normal[4];
-  double *det[NCS][7][5];
+  double *det[7][5];
 };