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

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-07-31 22:57:23 -0700 (Mon, 31 Jul 2006)
New Revision: 4130

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Param.py
   mc/3D/CitcomS/trunk/module/outputs.cc
   mc/3D/CitcomS/trunk/module/setProperties.cc
Log:
* Created pyre property for 'output_format'
* Changed the output function pointer in the python binding


Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Param.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Param.py	2006-08-01 00:54:45 UTC (rev 4129)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Param.py	2006-08-01 05:57:23 UTC (rev 4130)
@@ -50,6 +50,8 @@
         import pyre.inventory
 
 
+        output_format = pyre.inventory.str("output_format", default="ascii",
+                            validator=pyre.inventory.choice(["ascii", "hdf5"]))
 
         file_vbcs = pyre.inventory.bool("file_vbcs", default=False)
         vel_bound_file = pyre.inventory.str("vel_bound_file", default="bvel.dat")

Modified: mc/3D/CitcomS/trunk/module/outputs.cc
===================================================================
--- mc/3D/CitcomS/trunk/module/outputs.cc	2006-08-01 00:54:45 UTC (rev 4129)
+++ mc/3D/CitcomS/trunk/module/outputs.cc	2006-08-01 05:57:23 UTC (rev 4130)
@@ -56,7 +56,7 @@
 	    else
 		    assert(0);
     else
-	    output(E, cycles);
+	    (E->output)(E, cycles);
 
 
     Py_INCREF(Py_None);

Modified: mc/3D/CitcomS/trunk/module/setProperties.cc
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.cc	2006-08-01 00:54:45 UTC (rev 4129)
+++ mc/3D/CitcomS/trunk/module/setProperties.cc	2006-08-01 05:57:23 UTC (rev 4130)
@@ -286,6 +286,8 @@
     if (not m)
 	std::cout << "#Param.inventory:" << std::endl;
 
+    getStringProperty(properties, "output_format", E->control.output_format, m);
+
     getScalarProperty(properties, "file_vbcs", E->control.vbcs_file, m);
     getStringProperty(properties, "vel_bound_file", E->control.velocity_boundary_file, m);