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

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-10-12 14:43:09 -0700 (Thu, 12 Oct 2006)
New Revision: 4961

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/IC.py
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
'half_space_age' was not used when 'tic_method'=1. So, fixed the comment and
removed the conditional input


Modified: mc/3D/CitcomS/trunk/CitcomS/Components/IC.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/IC.py	2006-10-12 21:07:03 UTC (rev 4960)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/IC.py	2006-10-12 21:43:09 UTC (rev 4961)
@@ -110,11 +110,9 @@
         perturblayer = pyre.inventory.slice("perturblayer", default=[5])
         perturbmag = pyre.inventory.list("perturbmag", default=[0.05])
 
-        # for tic_method=1 and tic_method=2
+        # for tic_method=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	2006-10-12 21:07:03 UTC (rev 4960)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2006-10-12 21:43:09 UTC (rev 4961)
@@ -269,7 +269,6 @@
                                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);