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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-07-26 15:58:03 -0700 (Thu, 26 Jul 2007)
New Revision: 7756

Modified:
   mc/3D/CitcomS/branches/compressible/visual/batchcombine.py
   mc/3D/CitcomS/branches/compressible/visual/combine.py
Log:
Porting r7748.  Fixed a bug that *opt*.general files are mistakenly named. This bug is introduced by svn r7236

Modified: mc/3D/CitcomS/branches/compressible/visual/batchcombine.py
===================================================================
--- mc/3D/CitcomS/branches/compressible/visual/batchcombine.py	2007-07-26 22:57:44 UTC (rev 7755)
+++ mc/3D/CitcomS/branches/compressible/visual/batchcombine.py	2007-07-26 22:58:03 UTC (rev 7756)
@@ -107,9 +107,9 @@
 
     # combine
     import combine
-    combine.combine(datafile, fields, timestep,
-                    nodex, nodey, nodez,
-                    ncap, nprocx, nprocy, nprocz)
+    combined_files = combine.combine(datafile, fields, timestep,
+                                     nodex, nodey, nodez,
+                                     ncap, nprocx, nprocy, nprocz)
 
     # delete pasted files
     import glob
@@ -122,14 +122,6 @@
 
     # create .general file
     import dxgeneral
-    combined_files = []
-    if fields == 'coord,velo,visc':
-        fmt = '%(datafile)s.cap%(cap)02d.%(timestep)d'
-    else:
-        fmt = '%(datafile)s.opt%(cap)02d.%(timestep)d'
-    for cap in range(ncap):
-        combined_files.append(fmt % vars())
-
     dxgeneral.write(fields, ncompositions, combined_files)
 
     return

Modified: mc/3D/CitcomS/branches/compressible/visual/combine.py
===================================================================
--- mc/3D/CitcomS/branches/compressible/visual/combine.py	2007-07-26 22:57:44 UTC (rev 7755)
+++ mc/3D/CitcomS/branches/compressible/visual/combine.py	2007-07-26 22:58:03 UTC (rev 7756)
@@ -116,6 +116,7 @@
 
 def combine(prefix, opts, step, nodex, nodey, nodez,
             ncap, nprocx, nprocy, nprocz):
+    combined_files = []
     nproc_per_cap = nprocx * nprocy * nprocz
     for i in range(ncap):
         cb = Combine(nodex, nodey, nodez, nprocx, nprocy, nprocz)
@@ -132,7 +133,9 @@
 
         print 'writing', filename
         cb.write(filename)
+        combined_files.append(filename)
 
+    return combined_files
 
 
 if __name__ == '__main__':