[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->TWW as part of caps_per_proc removal (ff39c94)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:12:18 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit ff39c94d07539b4ae526ac20b557869160f0d621
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 17:10:51 2014 -0700
Changed the shape of E->TWW as part of caps_per_proc removal
>---------------------------------------------------------------
ff39c94d07539b4ae526ac20b557869160f0d621
lib/Composition_related.c | 2 +-
lib/Instructions.c | 4 ++--
lib/Nodal_mesh.c | 4 ++--
lib/Process_buoyancy.c | 2 +-
lib/Size_does_matter.c | 2 +-
lib/Solver_multigrid.c | 4 ++--
lib/global_defs.h | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/Composition_related.c b/lib/Composition_related.c
index 8f6652b..0d476c7 100644
--- a/lib/Composition_related.c
+++ b/lib/Composition_related.c
@@ -430,7 +430,7 @@ void map_composition_to_nodes(struct All_variables *E)
E->composition.comp_node[i][n] +=
E->composition.comp_el[i][nelem]*
- E->TWW[E->mesh.levmax][CPPR][nelem].node[nodenum];
+ E->TWW[E->mesh.levmax][nelem].node[nodenum];
}
}
diff --git a/lib/Instructions.c b/lib/Instructions.c
index cd86ec5..eaa1020 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1032,10 +1032,10 @@ void allocate_common_vars(E)
E->GNX[i] = (struct Shape_function_dx *)malloc((nel+1)*sizeof(struct Shape_function_dx));
E->GDA[i] = (struct Shape_function_dA *)malloc((nel+1)*sizeof(struct Shape_function_dA));
- E->MASS[i] = (double *) malloc((nno+1)*sizeof(double));
+ E->MASS[i]= (double *) malloc((nno+1)*sizeof(double));
E->ECO[i] = (struct COORD *) malloc((nno+2)*sizeof(struct COORD));
- E->TWW[i][CPPR] = (struct FNODE *) malloc((nel+2)*sizeof(struct FNODE));
+ E->TWW[i] = (struct FNODE *) malloc((nel+2)*sizeof(struct FNODE));
for(d=1;d<=E->mesh.nsd;d++)
for(l=1;l<=E->lmesh.NNO[i];l++) {
diff --git a/lib/Nodal_mesh.c b/lib/Nodal_mesh.c
index 45b3c4a..9af930f 100644
--- a/lib/Nodal_mesh.c
+++ b/lib/Nodal_mesh.c
@@ -203,7 +203,7 @@ void p_to_nodes(E,P,PN,lev)
for(element=0;element<E->lmesh.NEL[lev];element++)
for(j=1;j<=enodes[E->mesh.nsd];j++) {
node = E->IEN[lev][element+1].node[j];
- PN[node] += P[element] * E->TWW[lev][CPPR][element+1].node[j] ;
+ PN[node] += P[element] * E->TWW[lev][element+1].node[j] ;
}
(E->exchange_node_f)(E,PN,lev);
@@ -239,7 +239,7 @@ void visc_from_gint_to_nodes(E,VE,VN,lev)
for(j=1;j<=ends;j++) {
n = E->IEN[lev][e].node[j];
- VN[n] += E->TWW[lev][CPPR][e].node[j] * temp_visc;
+ VN[n] += E->TWW[lev][e].node[j] * temp_visc;
}
}
(E->exchange_node_f)(E,VN,lev);
diff --git a/lib/Process_buoyancy.c b/lib/Process_buoyancy.c
index bf00748..a93f7c6 100644
--- a/lib/Process_buoyancy.c
+++ b/lib/Process_buoyancy.c
@@ -108,7 +108,7 @@ void heat_flux(E)
uT /= E->eco[e].area;
for(j=1;j<=ends;j++)
- flux[E->ien[e].node[j]] += uT*E->TWW[lev][CPPR][e].node[j];
+ flux[E->ien[e].node[j]] += uT*E->TWW[lev][e].node[j];
} /* end of e */
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index f734377..60ed1d3 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -1039,7 +1039,7 @@ void mass_matrix(struct All_variables *E)
/* weight of each node, equivalent to pmass in ConMan */
for(node=1;node<=enodes[E->mesh.nsd];node++)
- E->TWW[lev][CPPR][e].node[node] = temp[node];
+ E->TWW[lev][e].node[node] = temp[node];
} /* end of ele*/
diff --git a/lib/Solver_multigrid.c b/lib/Solver_multigrid.c
index 42bdc90..dd6259d 100644
--- a/lib/Solver_multigrid.c
+++ b/lib/Solver_multigrid.c
@@ -459,7 +459,7 @@ void project_scalar(E,start_lev,AU,AD)
node= E->IEN[sl_minus][el].node[i];
- AD[node] += w * E->TWW[sl_minus][CPPR][el].node[i];
+ AD[node] += w * E->TWW[sl_minus][el].node[i];
}
(E->exchange_node_f)(E,AD,sl_minus);
@@ -522,7 +522,7 @@ void project_vector(E,start_lev,AU,AD,ic)
average2 += E->temp[E->ID[start_lev][CPPR][node1].doff[2]];
average3 += E->temp[E->ID[start_lev][CPPR][node1].doff[3]];
}
- w = weight*E->TWW[sl_minus][CPPR][el].node[i];
+ w = weight*E->TWW[sl_minus][el].node[i];
E->temp1[E->ID[sl_minus][CPPR][node].doff[1]] += w * average1;
E->temp1[E->ID[sl_minus][CPPR][node].doff[2]] += w * average2;
diff --git a/lib/global_defs.h b/lib/global_defs.h
index adc08cf..226af8e 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -802,7 +802,7 @@ struct All_variables {
struct ID *id;
struct COORD *ECO[MAX_LEVELS];
struct IEN *IEN[MAX_LEVELS]; /* global at each level */
- struct FNODE *TWW[MAX_LEVELS][NCS]; /* for nodal averages */
+ struct FNODE *TWW[MAX_LEVELS]; /* for nodal averages */
struct ID *ID[MAX_LEVELS][NCS];
struct SUBEL *EL[MAX_LEVELS][NCS];
struct EG *elt_del[MAX_LEVELS][NCS];
More information about the CIG-COMMITS
mailing list