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

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-08-01 12:06:42 -0700 (Tue, 01 Aug 2006)
New Revision: 4192

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Param.py
   mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
   mc/3D/CitcomS/trunk/module/setProperties.cc
Log:
Moved the 'output_format' property from Param.py to Solver.py


Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Param.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Param.py	2006-08-01 18:06:00 UTC (rev 4191)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Param.py	2006-08-01 19:06:42 UTC (rev 4192)
@@ -50,9 +50,6 @@
         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/CitcomS/Solver/Solver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2006-08-01 18:06:00 UTC (rev 4191)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2006-08-01 19:06:42 UTC (rev 4192)
@@ -319,6 +319,8 @@
 
         stokes_flow_only = pyre.inventory.bool("stokes_flow_only", default=False)
 
+        output_format = pyre.inventory.str("output_format", default="ascii",
+                            validator=pyre.inventory.choice(["ascii", "hdf5"]))
         verbose = pyre.inventory.bool("verbose", default=False)
         see_convergence = pyre.inventory.bool("see_convergence", default=True)
 

Modified: mc/3D/CitcomS/trunk/module/setProperties.cc
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.cc	2006-08-01 18:06:00 UTC (rev 4191)
+++ mc/3D/CitcomS/trunk/module/setProperties.cc	2006-08-01 19:06:42 UTC (rev 4192)
@@ -286,8 +286,6 @@
     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);
 
@@ -389,6 +387,7 @@
 
     getScalarProperty(properties, "stokes_flow_only", E->control.stokes, m);
 
+    getStringProperty(properties, "output_format", E->control.output_format, m);
     getScalarProperty(properties, "verbose", E->control.verbose, m);
     getScalarProperty(properties, "see_convergence", E->control.print_convergence, m);