[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->GDA as part of caps_per_proc removal (22a8e02)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Sep 23 18:45:52 PDT 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/3dd353175e1585eede6efdf2fa8a1f395160e481...980de677d7efb78fdd5c41fd4b35a9283a2d251f
>---------------------------------------------------------------
commit 22a8e02412aec8258f9aed555e64375b6113cbe1
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 16:41:43 2014 -0700
Changed the shape of E->GDA as part of caps_per_proc removal
>---------------------------------------------------------------
22a8e02412aec8258f9aed555e64375b6113cbe1
lib/Element_calculations.c | 6 +++---
lib/Instructions.c | 4 ++--
lib/Size_does_matter.c | 8 ++++----
lib/global_defs.h | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index 7364518..acfb1ae 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -307,7 +307,7 @@ void get_elt_k(E,el,elt_k,lev,iconv)
for(k=1;k<=vpts;k++) {
off = (el-1)*vpts+k;
- W[k]=g_point[k].weight[dims-1]*E->GDA[lev][CPPR][el].vpt[k]*E->EVI[lev][off];
+ W[k]=g_point[k].weight[dims-1]*E->GDA[lev][el].vpt[k]*E->EVI[lev][off];
#ifdef CITCOM_ALLOW_ANISOTROPIC_VISC
if(E->viscosity.allow_anisotropic_viscosity){
/* allow for a possibly anisotropic viscosity */
@@ -809,7 +809,7 @@ void get_elt_c(struct All_variables *E, int el, higher_precision elt_c[24][1], i
if ((el-1)%E->lmesh.ELZ[lev]==0)
construct_c3x3matrix_el(E,el,&E->element_Cc,&E->element_Ccx,lev,1);
- temp = p_point[1].weight[dims-1] * E->GDA[lev][CPPR][el].ppt[1];
+ temp = p_point[1].weight[dims-1] * E->GDA[lev][el].ppt[1];
switch (E->refstate.choice) {
case 1:
@@ -894,7 +894,7 @@ void get_elt_g(E,el,elt_del,lev)
get_rtf_at_ppts(E, lev, el, rtf);
- temp = p_point[1].weight[dims-1] * E->GDA[lev][CPPR][el].ppt[1];
+ temp = p_point[1].weight[dims-1] * E->GDA[lev][el].ppt[1];
#ifdef CITCOM_ALLOW_ANISOTROPIC_VISC
if(E->viscosity.allow_anisotropic_viscosity && modify_g){
diff --git a/lib/Instructions.c b/lib/Instructions.c
index 9c6d79f..7affade 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -1030,7 +1030,7 @@ void allocate_common_vars(E)
E->sphere.angle1[i][CPPR][k] = (double *) malloc((snel+1)*sizeof(double));
E->GNX[i] = (struct Shape_function_dx *)malloc((nel+1)*sizeof(struct Shape_function_dx));
- E->GDA[i][CPPR] = (struct Shape_function_dA *)malloc((nel+1)*sizeof(struct Shape_function_dA));
+ 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->ECO[i][CPPR] = (struct COORD *) malloc((nno+2)*sizeof(struct COORD));
@@ -1360,7 +1360,7 @@ void set_up_nonmg_aliases(struct All_variables *E)
E->cc = E->CC[E->mesh.levmax][CPPR];
E->ccx = E->CCX[E->mesh.levmax][CPPR];
E->Mass = E->MASS[E->mesh.levmax];
- E->gDA[CPPR] = E->GDA[E->mesh.levmax][CPPR];
+ E->gDA[CPPR] = E->GDA[E->mesh.levmax];
E->gNX[CPPR] = E->GNX[E->mesh.levmax];
for (i=1;i<=E->mesh.nsd;i++) {
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index 6f54d5f..fc09bd2 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -100,7 +100,7 @@ static void get_global_shape_fn_sph(struct All_variables *E,
* E->Nx.vpt[GNVXINDEX(d-1,i,k)];
jacobian = determinant(dxda, E->mesh.nsd);
- E->GDA[lev][CPPR][el].vpt[k] = jacobian;
+ E->GDA[lev][el].vpt[k] = jacobian;
for(d=1;d<=dims;d++)
for(e=1;e<=dims;e++)
@@ -145,7 +145,7 @@ static void get_global_shape_fn_sph(struct All_variables *E,
* E->Nx.ppt[GNPXINDEX(d-1,i,k)];
jacobian = determinant(dxda,E->mesh.nsd);
- E->GDA[lev][CPPR][el].ppt[k] = jacobian;
+ E->GDA[lev][el].ppt[k] = jacobian;
for(d=1;d<=dims;d++)
for(e=1;e<=dims;e++)
@@ -1024,13 +1024,13 @@ void mass_matrix(struct All_variables *E)
/* volume (area in 2D) of this element */
for(nint=1;nint<=vpts;nint++)
- area += g_point[nint].weight[E->mesh.nsd-1] * E->GDA[lev][CPPR][e].vpt[nint];
+ area += g_point[nint].weight[E->mesh.nsd-1] * E->GDA[lev][e].vpt[nint];
E->ECO[lev][CPPR][e].area = area;
for(node=1;node<=enodes[E->mesh.nsd];node++) {
temp[node] = 0.0;
for(nint=1;nint<=vpts;nint++)
- temp[node] += E->GDA[lev][CPPR][e].vpt[nint]*g_point[nint].weight[E->mesh.nsd-1]
+ temp[node] += E->GDA[lev][e].vpt[nint]*g_point[nint].weight[E->mesh.nsd-1]
*E->N.vpt[GNVINDEX(node,nint)]; /* int Na dV */
}
diff --git a/lib/global_defs.h b/lib/global_defs.h
index d92ae0a..c0724c3 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -869,7 +869,7 @@ struct All_variables {
float *age_t;
struct Shape_function_dx *GNX[MAX_LEVELS];
- struct Shape_function_dA *GDA[MAX_LEVELS][NCS];
+ struct Shape_function_dA *GDA[MAX_LEVELS];
struct Shape_function_dx *gNX[NCS];
struct Shape_function_dA *gDA[NCS];
More information about the CIG-COMMITS
mailing list