[cig-commits] r7222 - mc/3D/CitcomS/branches/v2.2/visual
tan2 at geodynamics.org
tan2 at geodynamics.org
Wed Jun 13 18:37:29 PDT 2007
Author: tan2
Date: 2007-06-13 18:37:29 -0700 (Wed, 13 Jun 2007)
New Revision: 7222
Modified:
mc/3D/CitcomS/branches/v2.2/visual/pasteCitcomData.py
Log:
Porting r7221 from trunk -- Fixing issue111: Expanding %RANK in autocombine.py
Modified: mc/3D/CitcomS/branches/v2.2/visual/pasteCitcomData.py
===================================================================
--- mc/3D/CitcomS/branches/v2.2/visual/pasteCitcomData.py 2007-06-14 01:36:27 UTC (rev 7221)
+++ mc/3D/CitcomS/branches/v2.2/visual/pasteCitcomData.py 2007-06-14 01:37:29 UTC (rev 7222)
@@ -42,6 +42,7 @@
def run(datadir, datafile, opts, rank, step, save_dir):
+ datadir = expand_datadir(datadir, rank)
outfile = '%s/%s.%s.%d.%d.pasted' % (save_dir, datafile, opts, rank, step)
f = open(outfile, 'w')
@@ -70,7 +71,7 @@
-def expand_datadir(datadir):
+def expand_datadir(datadir, rank):
'''Expand the special strings in datadir
'''
@@ -89,7 +90,7 @@
datadir.index(s)
except: pass
else:
- datadir = datadir.replace(s, rank)
+ datadir = datadir.replace(s, str(rank))
##
if datadir == "%DATADIR":
@@ -158,7 +159,7 @@
sys.exit()
- datadir = expand_datadir(sys.argv[1])
+ datadir = sys.argv[1]
datafile = sys.argv[2]
opts = sys.argv[3]
rank = int(sys.argv[4])
More information about the cig-commits
mailing list