[cig-commits] [commit] rajesh-petsc-schur: Changed the shape of E->gDA as part of caps_per_proc removal (0c7d172)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 19:12:12 PST 2014
Repository : https://github.com/geodynamics/citcoms
On branch : rajesh-petsc-schur
Link : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd
>---------------------------------------------------------------
commit 0c7d172f99e2ae6adb549cec6a46d34541026d8f
Author: Rajesh Kommu <rajesh.kommu at gmail.com>
Date: Tue Sep 23 16:50:45 2014 -0700
Changed the shape of E->gDA as part of caps_per_proc removal
>---------------------------------------------------------------
0c7d172f99e2ae6adb549cec6a46d34541026d8f
lib/Advection_diffusion.c | 2 +-
lib/Element_calculations.c | 2 +-
lib/Global_operations.c | 8 ++++----
lib/Instructions.c | 2 +-
lib/Process_buoyancy.c | 2 +-
lib/Size_does_matter.c | 2 +-
lib/Topo_gravity.c | 2 +-
lib/global_defs.h | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/Advection_diffusion.c b/lib/Advection_diffusion.c
index 7eaa9ea..8806454 100644
--- a/lib/Advection_diffusion.c
+++ b/lib/Advection_diffusion.c
@@ -381,7 +381,7 @@ static void pg_solver(struct All_variables *E,
/* XXX: replace diff with refstate.thermal_conductivity */
pg_shape_fn(E, el, &PG, &(E->gNX[el]), VV, rtf, diff);
- element_residual(E, el, &PG, &(E->gNX[el]), &(E->gDA[CPPR][el]),
+ element_residual(E, el, &PG, &(E->gNX[el]), &(E->gDA[el]),
VV, T, Tdot,
Q0, Eres, rtf, diff, E->sphere.cap[CPPR].TB,
FLAGS);
diff --git a/lib/Element_calculations.c b/lib/Element_calculations.c
index acfb1ae..650fff1 100644
--- a/lib/Element_calculations.c
+++ b/lib/Element_calculations.c
@@ -1007,7 +1007,7 @@ void get_elt_f(E,el,elt_f,bcs)
for(j=1;j<=vpts;j++) /*compute sum(Na(j)*F(j)*det(j)) */
elt_f[p] += force_at_gs[j] * E->N.vpt[GNVINDEX(a,j)]
- *E->gDA[CPPR][el].vpt[j]*g_point[j].weight[dims-1]
+ *E->gDA[el].vpt[j]*g_point[j].weight[dims-1]
*E->element_Cc.vpt[BVINDEX(3,i,a,j)];
/* imposed velocity terms */
diff --git a/lib/Global_operations.c b/lib/Global_operations.c
index 5a1af92..eab12da 100644
--- a/lib/Global_operations.c
+++ b/lib/Global_operations.c
@@ -319,8 +319,8 @@ float return_bulk_value(E,Z,average)
for(j=1;j<=vpts;j++)
for(i=1;i<=ends;i++) {
n = E->ien[el].node[i];
- volume1 += E->N.vpt[GNVINDEX(i,j)] * E->gDA[CPPR][el].vpt[j];
- integral1 += Z[CPPR][n] * E->N.vpt[GNVINDEX(i,j)] * E->gDA[CPPR][el].vpt[j];
+ volume1 += E->N.vpt[GNVINDEX(i,j)] * E->gDA[el].vpt[j];
+ integral1 += Z[CPPR][n] * E->N.vpt[GNVINDEX(i,j)] * E->gDA[el].vpt[j];
}
}
@@ -362,8 +362,8 @@ double return_bulk_value_d(E,Z,average)
for(j=1;j<=vpts;j++)
for(i=1;i<=ends;i++) {
n = E->ien[el].node[i];
- volume1 += E->N.vpt[GNVINDEX(i,j)] * E->gDA[CPPR][el].vpt[j];
- integral1 += Z[CPPR][n] * E->N.vpt[GNVINDEX(i,j)] * E->gDA[CPPR][el].vpt[j];
+ volume1 += E->N.vpt[GNVINDEX(i,j)] * E->gDA[el].vpt[j];
+ integral1 += Z[CPPR][n] * E->N.vpt[GNVINDEX(i,j)] * E->gDA[el].vpt[j];
}
}
diff --git a/lib/Instructions.c b/lib/Instructions.c
index b0b812f..7553e33 100644
--- a/lib/Instructions.c
+++ b/lib/Instructions.c
@@ -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];
+ E->gDA = E->GDA[E->mesh.levmax];
E->gNX = E->GNX[E->mesh.levmax];
for (i=1;i<=E->mesh.nsd;i++) {
diff --git a/lib/Process_buoyancy.c b/lib/Process_buoyancy.c
index 4c56bde..bf00748 100644
--- a/lib/Process_buoyancy.c
+++ b/lib/Process_buoyancy.c
@@ -102,7 +102,7 @@ void heat_flux(E)
area = 0.0;
for(i=1;i<=vpts;i++) {
/* XXX: missing unit conversion, heat capacity and thermal conductivity */
- uT += rho[i]*u[i]*T[i]*E->gDA[CPPR][e].vpt[i] + dTdz[i]*E->gDA[CPPR][e].vpt[i];
+ uT += rho[i]*u[i]*T[i]*E->gDA[e].vpt[i] + dTdz[i]*E->gDA[e].vpt[i];
}
uT /= E->eco[e].area;
diff --git a/lib/Size_does_matter.c b/lib/Size_does_matter.c
index fc09bd2..7ab82c2 100644
--- a/lib/Size_does_matter.c
+++ b/lib/Size_does_matter.c
@@ -1068,7 +1068,7 @@ void mass_matrix(struct All_variables *E)
for(nint=1;nint<=vpts;nint++)
temp[node] += E->refstate.rho[nz]
* E->refstate.heat_capacity[nz]
- * E->gDA[CPPR][e].vpt[nint]
+ * E->gDA[e].vpt[nint]
* g_point[nint].weight[E->mesh.nsd-1]
* E->N.vpt[GNVINDEX(node,nint)];
}
diff --git a/lib/Topo_gravity.c b/lib/Topo_gravity.c
index 25bc039..079be71 100644
--- a/lib/Topo_gravity.c
+++ b/lib/Topo_gravity.c
@@ -211,7 +211,7 @@ void compute_nodal_stress(struct All_variables *E,
velocities to nodes
local to the
element */
- dOmega = &(E->gDA[CPPR][e]); /* Jacobian at integration points */
+ dOmega = &(E->gDA[e]); /* Jacobian at integration points */
GNx = &(E->gNX[e]); /* derivatives of shape functions at
integration points */
diff --git a/lib/global_defs.h b/lib/global_defs.h
index 932e913..38f8c88 100644
--- a/lib/global_defs.h
+++ b/lib/global_defs.h
@@ -871,7 +871,7 @@ struct All_variables {
struct Shape_function_dx *GNX[MAX_LEVELS];
struct Shape_function_dA *GDA[MAX_LEVELS];
struct Shape_function_dx *gNX;
- struct Shape_function_dA *gDA[NCS];
+ struct Shape_function_dA *gDA;
struct Shape_function1 M; /* master-element shape funtions */
struct Shape_function1_dx Mx;
More information about the CIG-COMMITS
mailing list