[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of the sien member of the All_variables struct as part of caps_per_proc removal (6ffa50a)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:10:20 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 6ffa50aba5b6cddf06fee6c4a78df4d101ac4cda
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Thu Sep 18 13:51:28 2014 -0700
Changed the shape of the sien member of the All_variables struct as part of caps_per_proc removal
>---------------------------------------------------------------
6ffa50aba5b6cddf06fee6c4a78df4d101ac4cda
lib/Construct_arrays.c | 10 +++++-----
lib/Instructions.c | 2 +-
lib/Process_buoyancy.c | 16 ++++++++--------
lib/Sphere_harmonics.c | 6 +++---
lib/Topo_gravity.c | 20 ++++++++++----------
lib/global_defs.h | 2 +-
6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/lib/Construct_arrays.c b/lib/Construct_arrays.c
index 24c8dcc..891b48e 100644
--- a/lib/Construct_arrays.c
+++ b/lib/Construct_arrays.c
@@ -103,10 +103,10 @@ void construct_surface( struct All_variables *E)
for(element=1;element<=E->lmesh.nel;element++)
if ( element%E->lmesh.elz==0) { /* top */
e ++;
- E->sien[CPPR][e].node[1] = E->ien[element].node[5]/E->lmesh.noz;
- E->sien[CPPR][e].node[2] = E->ien[element].node[6]/E->lmesh.noz;
- E->sien[CPPR][e].node[3] = E->ien[element].node[7]/E->lmesh.noz;
- E->sien[CPPR][e].node[4] = E->ien[element].node[8]/E->lmesh.noz;
+ E->sien[e].node[1] = E->ien[element].node[5]/E->lmesh.noz;
+ 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;
}
@@ -118,7 +118,7 @@ void construct_surface( struct All_variables *E)
if(E->control.verbose) {
for(e=1;e<=E->lmesh.snel;e++) {
fprintf(E->fp_out, "sien sel=%d node=%d %d %d %d\n",
- e, E->sien[CPPR][e].node[1], E->sien[CPPR][e].node[2], E->sien[CPPR][e].node[3], E->sien[CPPR][e].node[4]);
+ e, E->sien[e].node[1], E->sien[e].node[2], E->sien[e].node[3], E->sien[e].node[4]);
}
}
}
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 12b2e97..107fc1f 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -988,7 +988,7 @@ void allocate_common_vars(E)
nxyz = max(nox*noz,nox*noy);
nxyz = 2*max(nxyz,noz*noy);
- E->sien[CPPR] = (struct SIEN *) malloc((nxyz+2)*sizeof(struct SIEN));
+ E->sien = (struct SIEN *) malloc((nxyz+2)*sizeof(struct SIEN));
E->surf_element[CPPR] = (int *) malloc((nxyz+2)*sizeof(int));
E->surf_node[CPPR] = (int *) malloc((nsf+2)*sizeof(int));
diff --git a/lib/Process_buoyancy.c b/lib/Process_buoyancy.c
index e0b5fb7..b76421e 100644
--- a/lib/Process_buoyancy.c
+++ b/lib/Process_buoyancy.c
@@ -128,18 +128,18 @@ void heat_flux(E)
- flux[CPPR][E->surf_node[CPPR][i]-E->lmesh.noz+2];
for(e=1;e<=E->lmesh.snel;e++) {
- uT =(E->slice.shflux[CPPR][E->sien[CPPR][e].node[1]] +
- E->slice.shflux[CPPR][E->sien[CPPR][e].node[2]] +
- E->slice.shflux[CPPR][E->sien[CPPR][e].node[3]] +
- E->slice.shflux[CPPR][E->sien[CPPR][e].node[4]])*0.25;
+ uT =(E->slice.shflux[CPPR][E->sien[e].node[1]] +
+ E->slice.shflux[CPPR][E->sien[e].node[2]] +
+ E->slice.shflux[CPPR][E->sien[e].node[3]] +
+ E->slice.shflux[CPPR][E->sien[e].node[4]])*0.25;
el = e*E->lmesh.elz;
sum_h[0] += uT*E->eco[CPPR][el].area;
sum_h[1] += E->eco[CPPR][el].area;
- uT =(E->slice.bhflux[CPPR][E->sien[CPPR][e].node[1]] +
- E->slice.bhflux[CPPR][E->sien[CPPR][e].node[2]] +
- E->slice.bhflux[CPPR][E->sien[CPPR][e].node[3]] +
- E->slice.bhflux[CPPR][E->sien[CPPR][e].node[4]])*0.25;
+ uT =(E->slice.bhflux[CPPR][E->sien[e].node[1]] +
+ E->slice.bhflux[CPPR][E->sien[e].node[2]] +
+ E->slice.bhflux[CPPR][E->sien[e].node[3]] +
+ E->slice.bhflux[CPPR][E->sien[e].node[4]])*0.25;
el = (e-1)*E->lmesh.elz+1;
sum_h[2] += uT*E->eco[CPPR][el].area;
sum_h[3] += E->eco[CPPR][el].area;
diff --git a/lib/Sphere_harmonics.c b/lib/Sphere_harmonics.c
index d2cd7e0..848870d 100644
--- a/lib/Sphere_harmonics.c
+++ b/lib/Sphere_harmonics.c
@@ -119,13 +119,13 @@ void sphere_expansion(E,TG,sphc,sphs)
for(nint=1;nint<=onedvpoints[E->mesh.nsd];nint++) {
for(d=1;d<=onedvpoints[E->mesh.nsd];d++) {
- j = E->sien[CPPR][es].node[d];
- sphc[p] += TG[CPPR][E->sien[CPPR][es].node[d]]
+ j = E->sien[es].node[d];
+ sphc[p] += TG[CPPR][E->sien[es].node[d]]
* E->sphere.tablesplm[CPPR][j][p]
* E->sphere.tablescosf[CPPR][j][mm]
* E->M.vpt[GMVINDEX(d,nint)]
* E->surf_det[CPPR][nint][es];
- sphs[p] += TG[CPPR][E->sien[CPPR][es].node[d]]
+ sphs[p] += TG[CPPR][E->sien[es].node[d]]
* E->sphere.tablesplm[CPPR][j][p]
* E->sphere.tablessinf[CPPR][j][mm]
* E->M.vpt[GMVINDEX(d,nint)]
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 9597e5b..8bc6ebd 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -1016,16 +1016,16 @@ void get_CBF_topo(E,H,HB) /* call this only for top and bottom processors*
if (m<=4) {
switch (m) {
case 1:
- nodes = E->sien[CPPR][els].node[1];
+ nodes = E->sien[els].node[1];
break;
case 2:
- nodes = E->sien[CPPR][els].node[2];
+ nodes = E->sien[els].node[2];
break;
case 3:
- nodes = E->sien[CPPR][els].node[3];
+ nodes = E->sien[els].node[3];
break;
case 4:
- nodes = E->sien[CPPR][els].node[4];
+ nodes = E->sien[els].node[4];
break;
}
RL[CPPR][nodes] += resb[(m-1)*dims+2];
@@ -1033,16 +1033,16 @@ void get_CBF_topo(E,H,HB) /* call this only for top and bottom processors*
else {
switch (m) {
case 5:
- nodes = E->sien[CPPR][els].node[1];
+ nodes = E->sien[els].node[1];
break;
case 6:
- nodes = E->sien[CPPR][els].node[2];
+ nodes = E->sien[els].node[2];
break;
case 7:
- nodes = E->sien[CPPR][els].node[3];
+ nodes = E->sien[els].node[3];
break;
case 8:
- nodes = E->sien[CPPR][els].node[4];
+ nodes = E->sien[els].node[4];
break;
}
RU[CPPR][nodes] += res[(m-1)*dims+2];
@@ -1074,10 +1074,10 @@ void get_CBF_topo(E,H,HB) /* call this only for top and bottom processors*
}
for (m=1;m<=onedv;m++) /* for bottom */
- SL[CPPR][E->sien[CPPR][els].node[m]] += eltTL[m-1];
+ SL[CPPR][E->sien[els].node[m]] += eltTL[m-1];
for (m=1;m<=onedv;m++)
- SU[CPPR][E->sien[CPPR][els].node[m]] += eltTU[m-1];
+ SU[CPPR][E->sien[els].node[m]] += eltTU[m-1];
}
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 19e6987..150da08 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -798,7 +798,7 @@ struct All_variables {
struct COORD *eco[NCS];
struct IEN *ien; /* global */
- struct SIEN *sien[NCS];
+ struct SIEN *sien;
struct ID *id[NCS];
struct COORD *ECO[MAX_LEVELS][NCS];
struct IEN *IEN[MAX_LEVELS][NCS]; /* global at each level */
More information about the CIG-COMMITS
mailing list