[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->surf_element as part of caps_per_proc removal (10b77c3)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Sep 23 15:25:19 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/c9d2a60c8943614964ddb17fcf2b487d6502cc61...de72b16d9861ac3cdb15de2810239649a2962931
>---------------------------------------------------------------
commit 10b77c300ef063930d08a1906b5b22ccd6305e32
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 14:08:54 2014 -0700
Changed the shape of E->surf_element as part of caps_per_proc removal
>---------------------------------------------------------------
10b77c300ef063930d08a1906b5b22ccd6305e32
lib/Construct_arrays.c | 2 +-
lib/Instructions.c | 2 +-
lib/Topo_gravity.c | 4 ++--
lib/global_defs.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index 92e0d2a..29bb540 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -107,7 +107,7 @@ void construct_surface( struct All_variables *E)
E->sien[e].node[2] = E->ien[element].node[6]/E->lmesh.noz;
E->sien[e].node[3] = E->ien[element].node[7]/E->lmesh.noz;
E->sien[e].node[4] = E->ien[element].node[8]/E->lmesh.noz;
- E->surf_element[CPPR][e] = element;
+ E->surf_element[e] = element;
}
E->lmesh.snel = e;
diff --git a/lib/Instructions.c b/lib/Instructions.c
index a29a092..c5e8095 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -989,7 +989,7 @@ void allocate_common_vars(E)
nxyz = 2*max(nxyz,noz*noy);
E->sien = (struct SIEN *) malloc((nxyz+2)*sizeof(struct SIEN));
- E->surf_element[CPPR] = (int *) malloc((nxyz+2)*sizeof(int));
+ E->surf_element = (int *) malloc((nxyz+2)*sizeof(int));
E->surf_node[CPPR] = (int *) malloc((nsf+2)*sizeof(int));
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 7194393..e72b212 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -966,7 +966,7 @@ void get_CBF_topo(E,H,HB) /* call this only for top and bottom processors*
/* calculate the element residuals */
for(els=1;els<=E->lmesh.snel;els++) {
- el = E->surf_element[CPPR][els];
+ el = E->surf_element[els];
elb = el - elz+1;
velo_from_element(E,VV,elb,sphere_key);
@@ -1054,7 +1054,7 @@ void get_CBF_topo(E,H,HB) /* call this only for top and bottom processors*
/* calculate the LHS */
for(els=1;els<=E->lmesh.snel;els++) {
- el = E->surf_element[j][els];
+ el = E->surf_element[els];
elb = el - elz+1;
get_global_1d_shape_fn_L(E,el,&GM,&dGammax,1);
diff --git a/lib/global_defs.h b/lib/global_defs.h
index f5b44e8..162cd36 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -860,7 +860,7 @@ struct All_variables {
int num_zero_resid[MAX_LEVELS][NCS];
int *zero_resid[MAX_LEVELS][NCS];
- int *surf_element[NCS],*surf_node[NCS];
+ int *surf_element,*surf_node[NCS];
int *mat[NCS];
float *VIP[NCS];
unsigned int *NODE[MAX_LEVELS][NCS];
More information about the CIG-COMMITS
mailing list