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

[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 239a5ba587651450b8b882988b3c7dcd249c21b4
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date:   Thu Sep 25 14:29:39 2014 -0700

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


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

239a5ba587651450b8b882988b3c7dcd249c21b4
 lib/Full_version_dependent.c     | 10 +++++-----
 lib/Regional_version_dependent.c |  4 ++--
 lib/global_defs.h                |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/Full_version_dependent.c b/lib/Full_version_dependent.c
index 1ad348d..81c039e 100644
--- a/lib/Full_version_dependent.c
+++ b/lib/Full_version_dependent.c
@@ -240,7 +240,7 @@ void full_construct_boundary( struct All_variables *E)
     E->boundary.element = (int *)malloc(max_size*sizeof(int));
 
     for(d=1; d<=dims; d++)
-      E->boundary.normal[CPPR][d] = (int *)malloc(max_size*sizeof(int));
+      E->boundary.normal[d] = (int *)malloc(max_size*sizeof(int));
 
     count = 1;
     for(k=1; k<=E->lmesh.ely; k++)
@@ -249,9 +249,9 @@ void full_construct_boundary( struct All_variables *E)
 	  i = 1;
 	  el = i + (j-1)*E->lmesh.elz + (k-1)*E->lmesh.elz*E->lmesh.elx;
 	  E->boundary.element[count] = el;
-	  E->boundary.normal[CPPR][dims][count] = -1;
+	  E->boundary.normal[dims][count] = -1;
 	  for(d=1; d<dims; d++)
-	      E->boundary.normal[CPPR][d][count] = 0;
+	      E->boundary.normal[d][count] = 0;
 	  ++count;
 	}
 
@@ -259,9 +259,9 @@ void full_construct_boundary( struct All_variables *E)
 	  i = E->lmesh.elz;
 	  el = i + (j-1)*E->lmesh.elz + (k-1)*E->lmesh.elz*E->lmesh.elx;
 	  E->boundary.element[count] = el;
-	  E->boundary.normal[CPPR][dims][count] = 1;
+	  E->boundary.normal[dims][count] = 1;
 	  for(d=1; d<dims; d++)
-	    E->boundary.normal[CPPR][d][count] = 0;
+	    E->boundary.normal[d][count] = 0;
 	  ++count;
 	}
 
diff --git a/lib/Regional_version_dependent.c b/lib/Regional_version_dependent.c
index d66c7dc..1a0e74c 100644
--- a/lib/Regional_version_dependent.c
+++ b/lib/Regional_version_dependent.c
@@ -203,7 +203,7 @@ void regional_construct_boundary( struct All_variables *E)
   E->boundary.element = (int *)malloc(max_size*sizeof(int));
 
   for(d=1; d<=dims; d++)
-    E->boundary.normal[CPPR][d] = (int *)malloc(max_size*sizeof(int));
+    E->boundary.normal[d] = (int *)malloc(max_size*sizeof(int));
 
 
     count = 1;
@@ -252,7 +252,7 @@ void regional_construct_boundary( struct All_variables *E)
 	    el = i + (j-1)*E->lmesh.elz + (k-1)*E->lmesh.elz*E->lmesh.elx;
 	    E->boundary.element[count] = el;
 	    for(d=1; d<=dims; d++)
-	      E->boundary.normal[CPPR][d][count] = normalFlag[d];
+	      E->boundary.normal[d][count] = normalFlag[d];
 
 	    ++count;
 	  }
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 9022f46..4b32d50 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -127,7 +127,7 @@ extern const int CPPR;
 struct Bdry {
   int nel;
   int *element;
-  int *normal[NCS][4];
+  int *normal[4];
   double *det[NCS][7][5];
 };