[cig-commits] r5298 - in mc/3D/CitcomS/trunk/CitcomS/Components: . Sphere

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-11-15 18:07:09 -0800 (Wed, 15 Nov 2006)
New Revision: 5298

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Const.py
   mc/3D/CitcomS/trunk/CitcomS/Components/Output.py
   mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py
Log:
Forgot to commit python files

Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Const.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Const.py	2006-11-16 02:07:00 UTC (rev 5297)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Const.py	2006-11-16 02:07:09 UTC (rev 5298)
@@ -72,14 +72,15 @@
         #depth_cmb = pyre.inventory.float("depth_cmb", default=2891e3*m)
 
         # everything in SI units
-        layerd = pyre.inventory.float("layerd", default=6371.0e3)
-        density = pyre.inventory.float("density", default=3500.0)
+        radius = pyre.inventory.float("radius", default=6371.0e3)
+        density = pyre.inventory.float("density", default=3340.0)
         thermdiff = pyre.inventory.float("thermdiff", default=1.0e-6)
-        gravacc = pyre.inventory.float("gravacc", default=10.0)
+        gravacc = pyre.inventory.float("gravacc", default=9.81)
         thermexp = pyre.inventory.float("thermexp", default=3.0e-5)
         refvisc = pyre.inventory.float("refvisc", default=1.0e21)
-        cp = pyre.inventory.float("cp", default=1250.0)
-        wdensity = pyre.inventory.float("wdensity", default=0.0)
+        cp = pyre.inventory.float("cp", default=1200.0)
+        density_above = pyre.inventory.float("density_above", default=1030.0)
+        density_below = pyre.inventory.float("density_below", default=6600.0)
         surftemp = pyre.inventory.float("surftemp", default=273.0)
 
         z_lith = pyre.inventory.float("z_lith", default=0.014)

Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Output.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Output.py	2006-11-16 02:07:00 UTC (rev 5297)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Output.py	2006-11-16 02:07:09 UTC (rev 5298)
@@ -54,6 +54,10 @@
                                                       "hdf5"]))
         output_optional = inv.str("output_optional", default="surf,botm")
 
+        # max. degree for spherical harmonics output
+        output_ll_max = pyre.inventory.int("output_ll_max", default=20)
+
+
         mega1 = 1024*1024
         #megaq = 256*1024
 

Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py	2006-11-16 02:07:00 UTC (rev 5297)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py	2006-11-16 02:07:09 UTC (rev 5298)
@@ -85,16 +85,8 @@
         radius_outer = pyre.inventory.float("radius_outer", default=1.0)
         radius_inner = pyre.inventory.float("radius_inner", default=0.55)
 
-	    # these parameters are for spherical harmonics output
-	    # put them here temporalily
-        ll_max = pyre.inventory.int("ll_max", default=20)
-        nlong = pyre.inventory.int("nlong", default=361)
-        nlati = pyre.inventory.int("nlati", default=181)
-        output_ll_max = pyre.inventory.int("output_ll_max", default=20)
 
 
-
-
 # version
 __id__ = "$Id$"