From b57e8e69a87f66e1fb81eca0e1236125fd5432b4 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 15 Sep 2020 22:38:50 -0400 Subject: [PATCH] switched save_ASCII() in more legacy scripts to legacy mode --- PRIVATE | 2 +- processing/legacy/addAPS34IDEstrainCoords.py | 2 +- processing/legacy/addCumulative.py | 2 +- processing/post/DADF5_postResults.py | 2 +- processing/pre/seeds_fromDistribution.py | 2 +- processing/pre/seeds_fromGeom.py | 2 +- processing/pre/seeds_fromPokes.py | 2 +- processing/pre/seeds_fromRandom.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PRIVATE b/PRIVATE index 5b7c34e58..3e789fc51 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 5b7c34e586589141d1e061f021512e65308fc1f7 +Subproject commit 3e789fc515dc2bdc63e042286dc06d8d072d096f diff --git a/processing/legacy/addAPS34IDEstrainCoords.py b/processing/legacy/addAPS34IDEstrainCoords.py index c82ff35a3..8f566b614 100755 --- a/processing/legacy/addAPS34IDEstrainCoords.py +++ b/processing/legacy/addAPS34IDEstrainCoords.py @@ -48,4 +48,4 @@ for name in filenames: coord[:,2] += table.get(options.depth)[:,0] table.add('coord',rot_to_TSL.broadcast_to(coord.shape[0]) @ coord,scriptID+' '+' '.join(sys.argv[1:]))\ - .save_ASCII(sys.stdout if name is None else name) + .save_ASCII((sys.stdout if name is None else name),legacy=True) diff --git a/processing/legacy/addCumulative.py b/processing/legacy/addCumulative.py index 14d8bcfea..0d88cc575 100755 --- a/processing/legacy/addCumulative.py +++ b/processing/legacy/addCumulative.py @@ -45,4 +45,4 @@ for name in filenames: np.cumprod(table.get(label),0) if options.product else np.cumsum(table.get(label),0), scriptID+' '+' '.join(sys.argv[1:])) - table.save_ASCII(sys.stdout if name is None else name) + table.save_ASCII((sys.stdout if name is None else name),legacy=True) diff --git a/processing/post/DADF5_postResults.py b/processing/post/DADF5_postResults.py index fa9df27b0..0226ad551 100755 --- a/processing/post/DADF5_postResults.py +++ b/processing/post/DADF5_postResults.py @@ -60,4 +60,4 @@ for filename in options.filenames: os.mkdir(dirname,0o755) file_out = '{}_inc{}.txt'.format(os.path.splitext(os.path.split(filename)[-1])[0], inc[3:].zfill(N_digits)) - table.save_ASCII(os.path.join(dirname,file_out)) + table.save_ASCII(os.path.join(dirname,file_out),legacy=True) diff --git a/processing/pre/seeds_fromDistribution.py b/processing/pre/seeds_fromDistribution.py index 1cf35450c..cc72920d3 100755 --- a/processing/pre/seeds_fromDistribution.py +++ b/processing/pre/seeds_fromDistribution.py @@ -89,7 +89,7 @@ class myThread (threading.Thread): coords[i]=newCoords direction[i]*=2. i+= 1 - perturbedSeedsTable.set('pos',coords).save_ASCII(perturbedSeedsVFile) + perturbedSeedsTable.set('pos',coords).save_ASCII(perturbedSeedsVFile,legacy=True) #--- do tesselation with perturbed seed file ------------------------------------------------------ perturbedGeomVFile.close() diff --git a/processing/pre/seeds_fromGeom.py b/processing/pre/seeds_fromGeom.py index 95f0d3815..4110405d6 100755 --- a/processing/pre/seeds_fromGeom.py +++ b/processing/pre/seeds_fromGeom.py @@ -65,4 +65,4 @@ for name in filenames: damask.Table(seeds[mask],{'pos':(3,)},comments)\ .add('microstructure',microstructure[mask].astype(int))\ - .save_ASCII(sys.stdout if name is None else os.path.splitext(name)[0]+'.seeds') + .save_ASCII(sys.stdout if name is None else os.path.splitext(name)[0]+'.seeds',legacy=True) diff --git a/processing/pre/seeds_fromPokes.py b/processing/pre/seeds_fromPokes.py index 5deb0ab1a..fdff40da3 100755 --- a/processing/pre/seeds_fromPokes.py +++ b/processing/pre/seeds_fromPokes.py @@ -93,4 +93,4 @@ for name in filenames: table = damask.Table(seeds,{'pos':(3,),'microstructure':(1,)},comments) table.set('microstructure',table.get('microstructure').astype(np.int))\ .save_ASCII(sys.stdout if name is None else \ - os.path.splitext(name)[0]+f'_poked_{options.N}.seeds') + os.path.splitext(name)[0]+f'_poked_{options.N}.seeds',legacy=True) diff --git a/processing/pre/seeds_fromRandom.py b/processing/pre/seeds_fromRandom.py index c1d454f67..8700a4648 100755 --- a/processing/pre/seeds_fromRandom.py +++ b/processing/pre/seeds_fromRandom.py @@ -162,4 +162,4 @@ for name in filenames: else np.random.normal(loc = options.mean, scale = options.sigma, size = options.N) table = table.add('weight',weights) - table.save_ASCII(sys.stdout if name is None else name) + table.save_ASCII(sys.stdout if name is None else name,legacy=True)