[cig-commits] r8157 - in mc/3D/CitcomS/trunk: lib module
tan2 at geodynamics.org
tan2 at geodynamics.org
Fri Oct 19 12:24:45 PDT 2007
Author: tan2
Date: 2007-10-19 12:24:45 -0700 (Fri, 19 Oct 2007)
New Revision: 8157
Modified:
mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
mc/3D/CitcomS/trunk/lib/Phase_change.c
mc/3D/CitcomS/trunk/lib/global_defs.h
mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Renamed control.width* -> control.inv_width* for clarity
Modified: mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Advection_diffusion.c 2007-10-19 17:50:33 UTC (rev 8156)
+++ mc/3D/CitcomS/trunk/lib/Advection_diffusion.c 2007-10-19 19:24:45 UTC (rev 8157)
@@ -827,13 +827,13 @@
static void latent_heating(struct All_variables *E, int m,
double *heating_latent, double *heating_adi,
float **B, float Ra, float clapeyron,
- float depth, float transT, float width)
+ float depth, float transT, float inv_width)
{
double temp, temp1, temp2, temp3;
int e, i, j;
const int ends = enodes[E->mesh.nsd];
- temp1 = 2.0 * width * clapeyron * Ra * E->control.disptn_number / E->control.Atemp / ends;
+ temp1 = 2.0 * inv_width * clapeyron * Ra * E->control.disptn_number / E->control.Atemp / ends;
for(e=1; e<=E->lmesh.nel; e++) {
temp2 = 0;
@@ -865,7 +865,7 @@
latent_heating(E, m, heating_latent, heating_adi,
E->Fas410, E->control.Ra_410,
E->control.clapeyron410, E->viscosity.z410,
- E->control.transT410, E->control.width410);
+ E->control.transT410, E->control.inv_width410);
}
@@ -873,14 +873,14 @@
latent_heating(E, m, heating_latent, heating_adi,
E->Fas670, E->control.Ra_670,
E->control.clapeyron670, E->viscosity.zlm,
- E->control.transT670, E->control.width670);
+ E->control.transT670, E->control.inv_width670);
}
if(E->control.Ra_cmb != 0.0) {
latent_heating(E, m, heating_latent, heating_adi,
E->Fascmb, E->control.Ra_cmb,
E->control.clapeyroncmb, E->viscosity.zcmb,
- E->control.transTcmb, E->control.widthcmb);
+ E->control.transTcmb, E->control.inv_widthcmb);
}
Modified: mc/3D/CitcomS/trunk/lib/Phase_change.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Phase_change.c 2007-10-19 17:50:33 UTC (rev 8156)
+++ mc/3D/CitcomS/trunk/lib/Phase_change.c 2007-10-19 19:24:45 UTC (rev 8157)
@@ -36,11 +36,11 @@
static void phase_change_apply(struct All_variables *E, double **buoy,
float **B, float **B_b,
float Ra, float clapeyron,
- float depth, float transT, float width);
+ float depth, float transT, float inv_width);
static void calc_phase_change(struct All_variables *E,
float **B, float **B_b,
float Ra, float clapeyron,
- float depth, float transT, float width);
+ float depth, float transT, float inv_width);
static void debug_phase_change(struct All_variables *E, float **B);
@@ -66,33 +66,34 @@
void phase_change_input(struct All_variables *E)
{
int m = E->parallel.me;
+ float width;
/* for phase change 410km */
input_float("Ra_410",&(E->control.Ra_410),"0.0",m);
input_float("clapeyron410",&(E->control.clapeyron410),"0.0",m);
input_float("transT410",&(E->control.transT410),"0.0",m);
- input_float("width410",&(E->control.width410),"0.0",m);
+ input_float("width410",&width,"0.0",m);
- if (E->control.width410!=0.0)
- E->control.width410 = 1.0/E->control.width410;
+ if (width!=0.0)
+ E->control.inv_width410 = 1.0/width;
/* for phase change 670km */
input_float("Ra_670",&(E->control.Ra_670),"0.0",m);
input_float("clapeyron670",&(E->control.clapeyron670),"0.0",m);
input_float("transT670",&(E->control.transT670),"0.0",m);
- input_float("width670",&(E->control.width670),"0.0",m);
+ input_float("width670",&width,"0.0",m);
- if (E->control.width670!=0.0)
- E->control.width670 = 1.0/E->control.width670;
+ if (width!=0.0)
+ E->control.inv_width670 = 1.0/width;
/* for phase change CMB */
input_float("Ra_cmb",&(E->control.Ra_cmb),"0.0",m);
input_float("clapeyroncmb",&(E->control.clapeyroncmb),"0.0",m);
input_float("transTcmb",&(E->control.transTcmb),"0.0",m);
- input_float("widthcmb",&(E->control.widthcmb),"0.0",m);
+ input_float("widthcmb",&width,"0.0",m);
- if (E->control.widthcmb!=0.0)
- E->control.widthcmb = 1.0/E->control.widthcmb;
+ if (width!=0.0)
+ E->control.inv_widthcmb = 1.0/width;
return;
@@ -104,7 +105,7 @@
if (E->control.Ra_410 != 0.0)
phase_change_apply(E, buoy, E->Fas410, E->Fas410_b, E->control.Ra_410,
E->control.clapeyron410, E->viscosity.z410,
- E->control.transT410, E->control.width410);
+ E->control.transT410, E->control.inv_width410);
return;
}
@@ -114,7 +115,7 @@
if (E->control.Ra_670 != 0.0)
phase_change_apply(E, buoy, E->Fas670, E->Fas670_b, E->control.Ra_670,
E->control.clapeyron670, E->viscosity.zlm,
- E->control.transT670, E->control.width670);
+ E->control.transT670, E->control.inv_width670);
return;
}
@@ -124,7 +125,7 @@
if (E->control.Ra_cmb != 0.0)
phase_change_apply(E, buoy, E->Fascmb, E->Fascmb_b, E->control.Ra_cmb,
E->control.clapeyroncmb, E->viscosity.zcmb,
- E->control.transTcmb, E->control.widthcmb);
+ E->control.transTcmb, E->control.inv_widthcmb);
return;
}
@@ -132,18 +133,18 @@
static void phase_change_apply(struct All_variables *E, double **buoy,
float **B, float **B_b,
float Ra, float clapeyron,
- float depth, float transT, float width)
+ float depth, float transT, float inv_width)
{
int m, i;
- calc_phase_change(E, B, B_b, Ra, clapeyron, depth, transT, width);
+ calc_phase_change(E, B, B_b, Ra, clapeyron, depth, transT, inv_width);
for(m=1;m<=E->sphere.caps_per_proc;m++)
for(i=1;i<=E->lmesh.nno;i++)
buoy[m][i] -= Ra * B[m][i];
if (E->control.verbose) {
- fprintf(E->fp_out, "Ra=%f, clapeyron=%f, depth=%f, transT=%f, width=%f\n",
- Ra, clapeyron, depth, transT, width);
+ fprintf(E->fp_out, "Ra=%f, clapeyron=%f, depth=%f, transT=%f, inv_width=%f\n",
+ Ra, clapeyron, depth, transT, inv_width);
debug_phase_change(E,B);
fflush(E->fp_out);
}
@@ -155,7 +156,7 @@
static void calc_phase_change(struct All_variables *E,
float **B, float **B_b,
float Ra, float clapeyron,
- float depth, float transT, float width)
+ float depth, float transT, float inv_width)
{
int i,j,k,n,ns,m,nz;
float e_pressure,pt5,one,dz;
@@ -172,7 +173,7 @@
e_pressure = dz * E->refstate.rho[nz] * E->refstate.gravity[nz]
- clapeyron * (E->T[m][i] - transT);
- B[m][i] = pt5 * (one + tanh(width * e_pressure));
+ B[m][i] = pt5 * (one + tanh(inv_width * e_pressure));
}
/* compute the phase boundary, defined as the depth where B==0.5 */
Modified: mc/3D/CitcomS/trunk/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/global_defs.h 2007-10-19 17:50:33 UTC (rev 8156)
+++ mc/3D/CitcomS/trunk/lib/global_defs.h 2007-10-19 19:24:45 UTC (rev 8157)
@@ -431,9 +431,9 @@
int reset_startage;
int zero_elapsed_time;
- float Ra_670,clapeyron670,transT670,width670;
- float Ra_410,clapeyron410,transT410,width410;
- float Ra_cmb,clapeyroncmb,transTcmb,widthcmb;
+ float Ra_670,clapeyron670,transT670,inv_width670;
+ float Ra_410,clapeyron410,transT410,inv_width410;
+ float Ra_cmb,clapeyroncmb,transTcmb,inv_widthcmb;
int augmented_Lagr;
double augmented;
Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c 2007-10-19 17:50:33 UTC (rev 8156)
+++ mc/3D/CitcomS/trunk/module/setProperties.c 2007-10-19 19:24:45 UTC (rev 8157)
@@ -395,6 +395,7 @@
PyObject *obj, *properties, *out;
struct All_variables *E;
FILE *fp;
+ float width;
if (!PyArg_ParseTuple(args, "OOO:Phase_set_properties",
&obj, &properties, &out))
@@ -408,26 +409,26 @@
getFloatProperty(properties, "Ra_410", E->control.Ra_410, fp);
getFloatProperty(properties, "clapeyron410", E->control.clapeyron410, fp);
getFloatProperty(properties, "transT410", E->control.transT410, fp);
- getFloatProperty(properties, "width410", E->control.width410, fp);
+ getFloatProperty(properties, "width410", width, fp);
- if (E->control.width410!=0.0)
- E->control.width410 = 1.0/E->control.width410;
+ if (width!=0.0)
+ E->control.inv_width410 = 1.0 / width;
getFloatProperty(properties, "Ra_670", E->control.Ra_670 , fp);
getFloatProperty(properties, "clapeyron670", E->control.clapeyron670, fp);
getFloatProperty(properties, "transT670", E->control.transT670, fp);
- getFloatProperty(properties, "width670", E->control.width670, fp);
+ getFloatProperty(properties, "width670", width, fp);
- if (E->control.width670!=0.0)
- E->control.width670 = 1.0/E->control.width670;
+ if (width!=0.0)
+ E->control.inv_width670 = 1.0 / width;
getFloatProperty(properties, "Ra_cmb", E->control.Ra_cmb, fp);
getFloatProperty(properties, "clapeyroncmb", E->control.clapeyroncmb, fp);
getFloatProperty(properties, "transTcmb", E->control.transTcmb, fp);
- getFloatProperty(properties, "widthcmb", E->control.widthcmb, fp);
+ getFloatProperty(properties, "widthcmb", width, fp);
- if (E->control.widthcmb!=0.0)
- E->control.widthcmb = 1.0/E->control.widthcmb;
+ if (width!=0.0)
+ E->control.inv_widthcmb = 1.0 / width;
PUTS(("\n"));
More information about the cig-commits
mailing list