[cig-commits] r4596 - in mc/3D/CitcomS/trunk: CitcomS/Solver lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-09-22 16:26:49 -0700 (Fri, 22 Sep 2006)
New Revision: 4596

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
   mc/3D/CitcomS/trunk/lib/Instructions.c
Log:
Write surf and botm output by default (but can be disabled by setting
output_optional=''), which is compatible with v2.0.x.


Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2006-09-22 23:09:22 UTC (rev 4595)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2006-09-22 23:26:49 UTC (rev 4596)
@@ -278,7 +278,7 @@
                                 validator=inv.choice(["ascii-local",
                                                       "ascii",
                                                       "hdf5"]))
-        output_optional = inv.str("output_optional", default="")
+        output_optional = inv.str("output_optional", default="surf,botm")
 
         verbose = inv.bool("verbose", default=False)
         see_convergence = inv.bool("see_convergence", default=True)

Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2006-09-22 23:09:22 UTC (rev 4595)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2006-09-22 23:26:49 UTC (rev 4596)
@@ -270,7 +270,7 @@
   input_string("datafile_old",E->control.old_P_file,"initialize",m);
 
   input_string("output_format",E->output.format,"ascii-local",m);
-  input_string("output_optional",E->output.optional,"",m);
+  input_string("output_optional",E->output.optional,"surf,botm",m);
 
   input_int("mgunitx",&(E->mesh.mgunitx),"1",m);
   input_int("mgunitz",&(E->mesh.mgunitz),"1",m);