[cig-commits] r6594 - in short/3D/PyLith/branches/pylith-0.8/pylith3d: module pylith3d

[leif at geodynamics.org]

Author: leif
Date: 2007-04-17 16:13:09 -0700 (Tue, 17 Apr 2007)
New Revision: 6594

Modified:
   short/3D/PyLith/branches/pylith-0.8/pylith3d/module/PyLithLib.pyx
   short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/PyLithApp.py
Log:
Don't open xxx.ascii file when 'asciiOutput' is set to 'none'.
Corrected "category" for output files.


Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/module/PyLithLib.pyx
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/module/PyLithLib.pyx	2007-04-17 20:49:46 UTC (rev 6593)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/module/PyLithLib.pyx	2007-04-17 23:13:09 UTC (rev 6594)
@@ -222,7 +222,8 @@
         #
 
         # xxx.ascii
-        f77open(self.kw, self.ofile)
+        if self.idout != 0:
+            f77open(self.kw, self.ofile)
 
         # xxx.plot
         if self.idsk == 0:
@@ -244,7 +245,7 @@
 
         finally:
             # close output files
-            f77close(self.kw)
+            if self.idout != 0: f77close(self.kw)
             if self.idsk != 0: f77close(self.kp)
 
         return

Modified: short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/PyLithApp.py
===================================================================
--- short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/PyLithApp.py	2007-04-17 20:49:46 UTC (rev 6593)
+++ short/3D/PyLith/branches/pylith-0.8/pylith3d/pylith3d/PyLithApp.py	2007-04-17 23:13:09 UTC (rev 6594)
@@ -382,8 +382,8 @@
         
         Inventory = self.metainventory
 
-        self.ofile                       = outputFile(Inventory.ofile,                      optional)
-        self.pfile                       = outputFile(Inventory.pfile,                      optional)
+        self.ofile                       = outputFile(Inventory.ofile, self.idout == "none" and unused or required)
+        self.pfile                       = outputFile(Inventory.pfile, self.idsk == "none" and unused or required)
         self.coordinateInputFile         = inputFile(Inventory.coordinateInputFile,         required)
         self.bcfile                      = inputFile(Inventory.bcfile,                      required)
         self.wfile                       = inputFile(Inventory.wfile,                       unused)