[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of the id member of the All_variables struct as part of caps_per_proc removal (f9edc69)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:10:26 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit f9edc69df31c44cb9ed02f79fdedc3dbfaf9dd2a
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Thu Sep 18 14:07:11 2014 -0700
Changed the shape of the id member of the All_variables struct as part of caps_per_proc removal
>---------------------------------------------------------------
f9edc69df31c44cb9ed02f79fdedc3dbfaf9dd2a
lib/BC_util.c | 6 +++---
lib/Element_calculations.c | 6 +++---
lib/Global_operations.c | 6 +++---
lib/Instructions.c | 2 +-
lib/Nodal_mesh.c | 18 +++++++++---------
lib/Petsc_citcoms.c | 6 +++---
lib/global_defs.h | 2 +-
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/lib/BC_util.c b/lib/BC_util.c
index 2743dba..fa33715 100644
--- a/lib/BC_util.c
+++ b/lib/BC_util.c
@@ -175,11 +175,11 @@ void velocities_conform_bcs(E,U)
for(node=1;node<=nno;node++) {
if (E->node[CPPR][node] & typex)
- U[CPPR][E->id[CPPR][node].doff[1]] = E->sphere.cap[CPPR].VB[1][node];
+ U[CPPR][E->id[node].doff[1]] = E->sphere.cap[CPPR].VB[1][node];
if (E->node[CPPR][node] & typey)
- U[CPPR][E->id[CPPR][node].doff[2]] = E->sphere.cap[CPPR].VB[2][node];
+ U[CPPR][E->id[node].doff[2]] = E->sphere.cap[CPPR].VB[2][node];
if (E->node[CPPR][node] & typez)
- U[CPPR][E->id[CPPR][node].doff[3]] = E->sphere.cap[CPPR].VB[3][node];
+ U[CPPR][E->id[node].doff[3]] = E->sphere.cap[CPPR].VB[3][node];
}
}
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index ed74a7d..eb9ba91 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -59,11 +59,11 @@ static void add_force(struct All_variables *E, int e, double elt_f[24])
for(a=1;a<=ends;a++) {
node = E->ien[e].node[a];
p=(a-1)*dims;
- a1=E->id[CPPR][node].doff[1];
+ a1=E->id[node].doff[1];
E->F[CPPR][a1] += elt_f[p];
- a2=E->id[CPPR][node].doff[2];
+ a2=E->id[node].doff[2];
E->F[CPPR][a2] += elt_f[p+1];
- a3=E->id[CPPR][node].doff[3];
+ a3=E->id[node].doff[3];
E->F[CPPR][a3] += elt_f[p+2];
}
}
diff --git a/lib/Global_operations.c b/lib/Global_operations.c
index 43ca355..8fab7b5 100644
--- a/lib/Global_operations.c
+++ b/lib/Global_operations.c
@@ -574,9 +574,9 @@ double global_v_norm2(struct All_variables *E, double **V)
temp = 0.0;
prod = 0.0;
for (i=1; i<=E->lmesh.nno; i++) {
- eqn1 = E->id[CPPR][i].doff[1];
- eqn2 = E->id[CPPR][i].doff[2];
- eqn3 = E->id[CPPR][i].doff[3];
+ eqn1 = E->id[i].doff[1];
+ eqn2 = E->id[i].doff[2];
+ eqn3 = E->id[i].doff[3];
/* L2 norm */
temp += (V[CPPR][eqn1] * V[CPPR][eqn1] +
V[CPPR][eqn2] * V[CPPR][eqn2] +
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 1b8cb09..2a0c8b7 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1353,7 +1353,7 @@ void set_up_nonmg_aliases(struct All_variables *E)
E->eco = E->ECO[E->mesh.levmax][CPPR];
E->ien = E->IEN[E->mesh.levmax][CPPR];
- E->id[CPPR] = E->ID[E->mesh.levmax][CPPR];
+ E->id = E->ID[E->mesh.levmax][CPPR];
E->Vi[CPPR] = E->VI[E->mesh.levmax][CPPR];
E->EVi[CPPR] = E->EVI[E->mesh.levmax][CPPR];
E->node[CPPR] = E->NODE[E->mesh.levmax][CPPR];
diff --git a/lib/Nodal_mesh.c b/lib/Nodal_mesh.c
index 00999bd..f6b4699 100644
--- a/lib/Nodal_mesh.c
+++ b/lib/Nodal_mesh.c
@@ -43,9 +43,9 @@ void v_from_vector(E)
const int nno = E->lmesh.nno;
for(node=1;node<=nno;node++) {
- E->sphere.cap[CPPR].V[1][node] = E->U[CPPR][E->id[CPPR][node].doff[1]];
- E->sphere.cap[CPPR].V[2][node] = E->U[CPPR][E->id[CPPR][node].doff[2]];
- E->sphere.cap[CPPR].V[3][node] = E->U[CPPR][E->id[CPPR][node].doff[3]];
+ E->sphere.cap[CPPR].V[1][node] = E->U[CPPR][E->id[node].doff[1]];
+ E->sphere.cap[CPPR].V[2][node] = E->U[CPPR][E->id[node].doff[2]];
+ E->sphere.cap[CPPR].V[3][node] = E->U[CPPR][E->id[node].doff[3]];
if (E->node[CPPR][node] & VBX)
E->sphere.cap[CPPR].V[1][node] = E->sphere.cap[CPPR].VB[1][node];
if (E->node[CPPR][node] & VBY)
@@ -62,9 +62,9 @@ void assign_v_to_vector(E)
const int nno = E->lmesh.nno;
for(node=1;node<=nno;node++) {
- E->U[CPPR][E->id[CPPR][node].doff[1]] = E->sphere.cap[CPPR].V[1][node];
- E->U[CPPR][E->id[CPPR][node].doff[2]] = E->sphere.cap[CPPR].V[2][node];
- E->U[CPPR][E->id[CPPR][node].doff[3]] = E->sphere.cap[CPPR].V[3][node];
+ E->U[CPPR][E->id[node].doff[1]] = E->sphere.cap[CPPR].V[1][node];
+ E->U[CPPR][E->id[node].doff[2]] = E->sphere.cap[CPPR].V[2][node];
+ E->U[CPPR][E->id[node].doff[3]] = E->sphere.cap[CPPR].V[3][node];
}
}
@@ -82,9 +82,9 @@ void v_from_vector_pseudo_surf(E)
E->sphere.cap[CPPR].Vprev[2][node] = E->sphere.cap[CPPR].V[2][node];
E->sphere.cap[CPPR].Vprev[3][node] = E->sphere.cap[CPPR].V[3][node];
- E->sphere.cap[CPPR].V[1][node] = E->U[CPPR][E->id[CPPR][node].doff[1]];
- E->sphere.cap[CPPR].V[2][node] = E->U[CPPR][E->id[CPPR][node].doff[2]];
- E->sphere.cap[CPPR].V[3][node] = E->U[CPPR][E->id[CPPR][node].doff[3]];
+ E->sphere.cap[CPPR].V[1][node] = E->U[CPPR][E->id[node].doff[1]];
+ E->sphere.cap[CPPR].V[2][node] = E->U[CPPR][E->id[node].doff[2]];
+ E->sphere.cap[CPPR].V[3][node] = E->U[CPPR][E->id[node].doff[3]];
if (E->node[CPPR][node] & VBX)
E->sphere.cap[CPPR].V[1][node] = E->sphere.cap[CPPR].VB[1][node];
if (E->node[CPPR][node] & VBY)
diff --git a/lib/Petsc_citcoms.c b/lib/Petsc_citcoms.c
index 00fb850..2b7a003 100644
--- a/lib/Petsc_citcoms.c
+++ b/lib/Petsc_citcoms.c
@@ -16,9 +16,9 @@ double global_v_norm2_PETSc( struct All_variables *E, Vec v )
PetscScalar *V;
ierr = VecGetArray( v, &V ); CHKERRQ( ierr );
for (i=1; i<=E->lmesh.nno; i++) {
- eqn1 = E->id[CPPR][i].doff[1];
- eqn2 = E->id[CPPR][i].doff[2];
- eqn3 = E->id[CPPR][i].doff[3];
+ eqn1 = E->id[i].doff[1];
+ eqn2 = E->id[i].doff[2];
+ eqn3 = E->id[i].doff[3];
/* L2 norm */
temp += (V[eqn1] * V[eqn1] + V[eqn2] * V[eqn2] + V[eqn3] * V[eqn3]) * E->NMass[CPPR][i];
}
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 07a1673..95ee288 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -799,7 +799,7 @@ struct All_variables {
struct COORD *eco;
struct IEN *ien; /* global */
struct SIEN *sien;
- struct ID *id[NCS];
+ struct ID *id;
struct COORD *ECO[MAX_LEVELS][NCS];
struct IEN *IEN[MAX_LEVELS][NCS]; /* global at each level */
struct FNODE *TWW[MAX_LEVELS][NCS]; /* for nodal averages */
More information about the CIG-COMMITS
mailing list