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

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-09-03 17:11:36 -0700 (Wed, 03 Sep 2008)
New Revision: 12800

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Output.py
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
pyre input for "self_gravitation"


Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Output.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Output.py	2008-09-04 00:10:51 UTC (rev 12799)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Output.py	2008-09-04 00:11:36 UTC (rev 12800)
@@ -51,6 +51,7 @@
         output_format = inv.str("output_format", default="ascii",
                                 validator=inv.choice(["ascii",
                                                       "ascii-gz",
+						      "vtk",
                                                       "hdf5"]))
         output_optional = inv.str("output_optional",
                                   default="surf,botm,tracer")
@@ -63,6 +64,8 @@
         # max. degree for spherical harmonics output
         output_ll_max = inv.int("output_ll_max", default=20)
 
+        # self-gravitation, for geoid only
+        self_gravitation = inv.bool("self_gravitation", default=False)
 
         mega1 = 1024*1024
         #megaq = 256*1024

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2008-09-04 00:10:51 UTC (rev 12799)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2008-09-04 00:11:36 UTC (rev 12800)
@@ -323,6 +323,7 @@
     E->output.gzdir.vtk_base_save = 1;
 
     getIntProperty(properties, "output_ll_max", E->output.llmax, fp);
+    getIntProperty(properties, "self_gravitation", E->control.self_gravitation, fp);
 
     getIntProperty(properties, "cb_block_size", E->output.cb_block_size, fp);
     getIntProperty(properties, "cb_buffer_size", E->output.cb_buffer_size, fp);