[cig-commits] r7871 - in mc/3D/CitcomS/trunk: lib module
tan2 at geodynamics.org
tan2 at geodynamics.org
Thu Aug 23 13:14:05 PDT 2007
Author: tan2
Date: 2007-08-23 13:14:04 -0700 (Thu, 23 Aug 2007)
New Revision: 7871
Modified:
mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
mc/3D/CitcomS/trunk/lib/Material_properties.c
mc/3D/CitcomS/trunk/lib/Pan_problem_misc_functions.c
mc/3D/CitcomS/trunk/lib/Process_buoyancy.c
mc/3D/CitcomS/trunk/lib/Size_does_matter.c
mc/3D/CitcomS/trunk/lib/global_defs.h
mc/3D/CitcomS/trunk/module/mesher.c
Log:
Minor refactoring: add comments, rename variables
Modified: mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Advection_diffusion.c 2007-08-23 17:55:25 UTC (rev 7870)
+++ mc/3D/CitcomS/trunk/lib/Advection_diffusion.c 2007-08-23 20:14:04 UTC (rev 7871)
@@ -127,7 +127,7 @@
predictor(E,E->T,E->Tdot);
for(psc_pass=0;psc_pass<E->advection.temp_iterations;psc_pass++) {
- /* XXX: replace inputdiff with refstate.conductivity */
+ /* XXX: replace inputdiff with refstate.thermal_conductivity */
pg_solver(E,E->T,E->Tdot,DTdot,E->convection.heat_sources,E->control.inputdiff,1,E->node);
corrector(E,E->T,E->Tdot,DTdot);
temperatures_conform_bcs(E);
@@ -330,7 +330,7 @@
get_global_shape_fn(E, el, &GN, &GNx, &dOmega, 0,
sphere_key, rtf, E->mesh.levmax, m);
- /* XXX: replace diff with refstate.conductivity */
+ /* XXX: replace diff with refstate.thermal_conductivity */
pg_shape_fn(E, el, &PG, &GNx, VV,
rtf, diff, m);
element_residual(E, el, PG, GNx, dOmega, VV, T, Tdot,
@@ -771,7 +771,7 @@
/* XXX: missing gravity */
heating[e] = temp * temp2 * 0.25
- * (E->refstate.expansivity[ez] + E->refstate.expansivity[ez + 1])
+ * (E->refstate.thermal_expansivity[ez] + E->refstate.thermal_expansivity[ez + 1])
* (E->refstate.rho[ez] + E->refstate.rho[ez + 1]);
}
Modified: mc/3D/CitcomS/trunk/lib/Material_properties.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Material_properties.c 2007-08-23 17:55:25 UTC (rev 7870)
+++ mc/3D/CitcomS/trunk/lib/Material_properties.c 2007-08-23 20:14:04 UTC (rev 7871)
@@ -46,13 +46,13 @@
E->refstate.rho = (double *) malloc((noz+1)*sizeof(double));
/* reference profile of coefficient of thermal expansion */
- E->refstate.expansivity = (double *) malloc((noz+1)*sizeof(double));
+ E->refstate.thermal_expansivity = (double *) malloc((noz+1)*sizeof(double));
/* reference profile of heat capacity */
- E->refstate.capacity = (double *) malloc((noz+1)*sizeof(double));
+ E->refstate.heat_capacity = (double *) malloc((noz+1)*sizeof(double));
/* reference profile of thermal conductivity */
- E->refstate.conductivity = (double *) malloc((noz+1)*sizeof(double));
+ E->refstate.thermal_conductivity = (double *) malloc((noz+1)*sizeof(double));
/* reference profile of gravity */
E->refstate.gravity = (double *) malloc((noz+1)*sizeof(double));
@@ -77,20 +77,23 @@
E->control.disptn_number, 1.0/E->control.inv_gruneisen,
E->data.surf_temp, E->data.ref_temperature);
+ /* All refstate variables (except Tadi) must be 1 at the surface.
+ * Otherwise, the scaling of eqns in the code might not be correct. */
+
for(i=1; i<=noz; i++) {
r = E->sx[1][3][i];
z = 1 - r;
E->refstate.rho[i] = exp(beta*z);
- E->refstate.expansivity[i] = 1;
- E->refstate.capacity[i] = 1;
- E->refstate.conductivity[i] = 1;
+ E->refstate.thermal_expansivity[i] = 1;
+ E->refstate.heat_capacity[i] = 1;
+ E->refstate.thermal_conductivity[i] = 1;
E->refstate.gravity[i] = 1;
E->refstate.Tadi[i] = T0 * (exp(E->control.disptn_number * z) - 1);
}
if(E->parallel.me == 0) {
- fprintf(stderr, "nz radius depth rho Tadi\n");
- fprintf(E->fp, "nz radius depth rho Tadi\n");
+ fprintf(stderr, "nz radius depth rho Tadi\n");
+ fprintf(E->fp, "nz radius depth rho Tadi\n");
}
if(E->parallel.me < E->parallel.nprocz)
for(i=1; i<=noz; i++) {
@@ -105,11 +108,3 @@
}
-void density(struct All_variables *E, double *rho)
-{
- int i;
- for(i=1; i<=E->lmesh.nno; i++) {
- rho[i] = 1;
- }
-
-}
Modified: mc/3D/CitcomS/trunk/lib/Pan_problem_misc_functions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Pan_problem_misc_functions.c 2007-08-23 17:55:25 UTC (rev 7870)
+++ mc/3D/CitcomS/trunk/lib/Pan_problem_misc_functions.c 2007-08-23 20:14:04 UTC (rev 7871)
@@ -151,7 +151,7 @@
* since the horizontal average of buoy will be removed.
*/
buoy[m][i] = temp * E->refstate.rho[nz]
- * E->refstate.expansivity[nz] * E->T[m][i];
+ * E->refstate.thermal_expansivity[nz] * E->T[m][i];
}
/* chemical buoyancy */
Modified: mc/3D/CitcomS/trunk/lib/Process_buoyancy.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Process_buoyancy.c 2007-08-23 17:55:25 UTC (rev 7870)
+++ mc/3D/CitcomS/trunk/lib/Process_buoyancy.c 2007-08-23 20:14:04 UTC (rev 7871)
@@ -107,7 +107,7 @@
uT = 0.0;
area = 0.0;
for(i=1;i<=vpts;i++) {
- /* XXX: missing unit conversion, heat capacity and conductivity */
+ /* XXX: missing unit conversion, heat capacity and thermal conductivity */
uT += u[i]*T[i]*dOmega.vpt[i] + dTdz[i]*dOmega.vpt[i];
}
Modified: mc/3D/CitcomS/trunk/lib/Size_does_matter.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Size_does_matter.c 2007-08-23 17:55:25 UTC (rev 7870)
+++ mc/3D/CitcomS/trunk/lib/Size_does_matter.c 2007-08-23 20:14:04 UTC (rev 7871)
@@ -995,7 +995,7 @@
nz = ((E->ien[m][e].node[node]-1) % E->lmesh.noz) + 1;
for(nint=1;nint<=vpts;nint++) {
temp[node] += E->refstate.rho[nz]
- * E->refstate.capacity[nz]
+ * E->refstate.heat_capacity[nz]
* dOmega.vpt[nint]
* g_point[nint].weight[E->mesh.nsd-1]
* E->N.vpt[GNVINDEX(node,nint)]; /* int Na dV */
Modified: mc/3D/CitcomS/trunk/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/global_defs.h 2007-08-23 17:55:25 UTC (rev 7870)
+++ mc/3D/CitcomS/trunk/lib/global_defs.h 2007-08-23 20:14:04 UTC (rev 7871)
@@ -525,9 +525,9 @@
struct REF_STATE {
double *rho;
- double *expansivity;
- double *capacity;
- double *conductivity;
+ double *thermal_expansivity;
+ double *heat_capacity;
+ double *thermal_conductivity;
double *gravity;
double *Tadi;
};
Modified: mc/3D/CitcomS/trunk/module/mesher.c
===================================================================
--- mc/3D/CitcomS/trunk/module/mesher.c 2007-08-23 17:55:25 UTC (rev 7870)
+++ mc/3D/CitcomS/trunk/module/mesher.c 2007-08-23 20:14:04 UTC (rev 7871)
@@ -32,7 +32,6 @@
#include "global_defs.h"
#include "parallel_related.h"
-#include "material_properties.h"
extern void initial_mesh_solver_setup(struct All_variables *);
More information about the cig-commits
mailing list