[cig-commits] r7088 - mc/3D/CitcomS/branches/compressible/visual

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-06-07 07:02:13 -0700 (Thu, 07 Jun 2007)
New Revision: 7088

Modified:
   mc/3D/CitcomS/branches/compressible/visual/batchcombine.py
Log:
Fixed issue110

Modified: mc/3D/CitcomS/branches/compressible/visual/batchcombine.py
===================================================================
--- mc/3D/CitcomS/branches/compressible/visual/batchcombine.py	2007-06-07 04:32:14 UTC (rev 7087)
+++ mc/3D/CitcomS/branches/compressible/visual/batchcombine.py	2007-06-07 14:02:13 UTC (rev 7088)
@@ -107,13 +107,13 @@
     opts1 = optional_fields
 
     batchpaste(datadir, datafile, opts0, timestep, nodes)
-    batchpaste(datadir, datafile, opts1, timestep, nodes)
+    if opts1: batchpaste(datadir, datafile, opts1, timestep, nodes)
 
     # combine
     import combine
     combine.combine(datafile, opts0, timestep, nodex, nodey, nodez,
                         ncap, nprocx, nprocy, nprocz)
-    combine.combine(datafile, opts1, timestep, nodex, nodey, nodez,
+    if opts1: combine.combine(datafile, opts1, timestep, nodex, nodey, nodez,
                     ncap, nprocx, nprocy, nprocz)
 
     # delete pasted files
@@ -131,10 +131,10 @@
     combined_files1 = []
     for cap in range(ncap):
         combined_files0.append('%(datafile)s.cap%(cap)02d.%(timestep)d' % vars())
-        combined_files1.append('%(datafile)s.opt%(cap)02d.%(timestep)d' % vars())
+        if opts1: combined_files1.append('%(datafile)s.opt%(cap)02d.%(timestep)d' % vars())
 
     dxgeneral.write(opts0, 0, combined_files0)
-    dxgeneral.write(opts1, ncompositions, combined_files1)
+    if opts1: dxgeneral.write(opts1, ncompositions, combined_files1)
 
     return