[cig-commits] r5795 - in mc/3D/CitcomS/trunk: CitcomS/Components module

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-01-16 11:49:51 -0800 (Tue, 16 Jan 2007)
New Revision: 5795

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/IC.py
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Read input parameter 'half_space_age' when tic_method=1

Modified: mc/3D/CitcomS/trunk/CitcomS/Components/IC.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/IC.py	2007-01-16 18:50:16 UTC (rev 5794)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/IC.py	2007-01-16 19:49:51 UTC (rev 5795)
@@ -116,9 +116,11 @@
         perturblayer = pyre.inventory.slice("perturblayer", default=[5])
         perturbmag = pyre.inventory.list("perturbmag", default=[0.05])
 
-        # for tic_method=2
+        # for tic_method=1 or 2
         half_space_age = pyre.inventory.float("half_space_age", default=40,
                               validator=pyre.inventory.greater(1e-3))
+
+        # for tic_method=2
         blob_center = pyre.inventory.list("blob_center", default=[-999., -999., -999.])
         blob_radius = pyre.inventory.float("blob_radius", default=0.063)
         blob_dT = pyre.inventory.float("blob_dT", default=0.18)

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2007-01-16 18:50:16 UTC (rev 5794)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2007-01-16 19:49:51 UTC (rev 5795)
@@ -265,6 +265,7 @@
                                num_perturb, fp);
     }
     else if (E->convection.tic_method == 1) {
+        getFloatProperty(properties, "half_space_age", E->convection.half_space_age, fp);
     }
     else if (E->convection.tic_method == 2) {
         getFloatProperty(properties, "half_space_age", E->convection.half_space_age, fp);