[cig-commits] r5300 - mc/3D/CitcomS/trunk/module

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-11-15 19:04:21 -0800 (Wed, 15 Nov 2006)
New Revision: 5300

Modified:
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Forgot to commit module/ directory

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2006-11-16 03:01:59 UTC (rev 5299)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2006-11-16 03:04:21 UTC (rev 5300)
@@ -187,14 +187,15 @@
 
     PUTS(("[CitcomS.solver.const]\n"));
 
-    getFloatProperty(properties, "layerd", radius, fp);
+    getFloatProperty(properties, "radius", radius, fp);
     getFloatProperty(properties, "density", E->data.density, fp);
     getFloatProperty(properties, "thermdiff", E->data.therm_diff, fp);
     getFloatProperty(properties, "gravacc", E->data.grav_acc, fp);
     getFloatProperty(properties, "thermexp", E->data.therm_exp, fp);
     getFloatProperty(properties, "refvisc", E->data.ref_viscosity, fp);
     getFloatProperty(properties, "cp", E->data.Cp, fp);
-    getFloatProperty(properties, "wdensity", E->data.density_above, fp);
+    getFloatProperty(properties, "density_above", E->data.density_above, fp);
+    getFloatProperty(properties, "density_below", E->data.density_below, fp);
     getFloatProperty(properties, "surftemp", E->data.surf_temp, fp);
 
     E->data.therm_cond = E->data.therm_diff * E->data.density * E->data.Cp;
@@ -208,8 +209,7 @@
     getFloatProperty(properties, "z_cmb", E->viscosity.zcmb, fp); /* this is used as the D" phase change depth */
 
     /* convert meter to kilometer */
-    E->data.layer_km = radius / 1e3;
-    E->data.radius_km = E->data.layer_km;
+    E->data.radius_km = radius / 1e3;
 
     PUTS(("\n"));
 
@@ -310,6 +310,8 @@
     getStringProperty(properties, "output_format", E->output.format, fp);
     getStringProperty(properties, "output_optional", E->output.optional, fp);
 
+    getIntProperty(properties, "output_ll_max", E->output.llmax, fp);
+
     getIntProperty(properties, "cb_block_size", E->output.cb_block_size, fp);
     getIntProperty(properties, "cb_buffer_size", E->output.cb_buffer_size, fp);
 
@@ -590,11 +592,6 @@
 	E->sphere.cap[1].fi[4] = E->control.fi_max;
     }
 
-    getIntProperty(properties, "ll_max", E->sphere.llmax, fp);
-    getIntProperty(properties, "nlong", E->sphere.noy, fp);
-    getIntProperty(properties, "nlati", E->sphere.nox, fp);
-    getIntProperty(properties, "output_ll_max", E->sphere.output_llmax, fp);
-
     E->mesh.layer[1] = 1;
     E->mesh.layer[2] = 1;
     E->mesh.layer[3] = 1;
@@ -774,7 +771,7 @@
         return -1;
     if (-1 == PyString_AsStringAndSize(prop, &buffer, &length))
         return -1;
-        
+
     if (length >= (Py_ssize_t)valueSize) {
         PyErr_Format(PyExc_ValueError,
                      "value of '%s' cannot exceed %zu characters in length",