223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

now also using numpy

This commit is contained in:
Martin Diehl 2013-05-14 17:00:41 +00:00
parent 7ae786e802
commit 563e74c832
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
processing/pre/geom_pack.py
View File

@ -39,7 +39,6 @@ mappings = {
'microstructures': lambda x: int(x),
}
parser = OptionParser(option_class=extendedOption, usage='%prog options [file[s]]', description = """
compress geometry files with ranges "a to b" and/or multiples "n of x".
""" + string.replace('$Id$','\n','\\n')
@ -80,12 +79,13 @@ for file in files:
content = file['input'].readlines()
file['input'].close()
#--- interpretate header --------------------------------------------------------------------------
info = {'grid': [0,0,0],
'size': [0.0,0.0,0.0],
'origin': [0.0,0.0,0.0],
'homogenization': 1,
#--- interprete header ----------------------------------------------------------------------------
info = {
'grid': numpy.zeros(3,'i'),
'size': numpy.zeros(3,'d'),
'origin': numpy.zeros(3,'d'),
'microstructures': 0,
'homogenization': 0,
}
new_header = []
@ -102,10 +102,10 @@ for file in files:
info[headitems[0]] = mappings[headitems[0]](headitems[1])
new_header.append(header)
if info['grid'] == [0,0,0]:
if numpy.all(info['grid'] == 0):
file['croak'].write('no grid info found.\n')
continue
if info['size'] == [0.0,0.0,0.0]:
if numpy.all(info['size'] == 0.0):
file['croak'].write('no size info found.\n')
continue

20
processing/pre/geom_unpack.py
View File

@ -4,7 +4,6 @@
import os,sys,string,re,math,numpy
from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP
#--------------------------------------------------------------------------------------------------
class extendedOption(Option):
#--------------------------------------------------------------------------------------------------
@ -32,7 +31,6 @@ identifiers = {
'size': ['x','y','z'],
'origin': ['x','y','z'],
}
mappings = {
'grid': lambda x: int(x),
'size': lambda x: float(x),
@ -41,7 +39,6 @@ mappings = {
'microstructures': lambda x: int(x),
}
parser = OptionParser(option_class=extendedOption, usage='%prog options [file[s]]', description = """
Unpack geometry files containing ranges "a to b" and/or "n of x" multiples (exclusively in one line).
""" + string.replace('$Id$','\n','\\n')
@ -87,12 +84,13 @@ for file in files:
content = file['input'].readlines()
file['input'].close()
#--- interpretate header --------------------------------------------------------------------------
info = {'grid': [0,0,0],
'size': [0.0,0.0,0.0],
'origin': [0.0,0.0,0.0],
'homogenization': 1,
#--- interprete header ----------------------------------------------------------------------------
info = {
'grid': numpy.zeros(3,'i'),
'size': numpy.zeros(3,'d'),
'origin': numpy.zeros(3,'d'),
'microstructures': 0,
'homogenization': 0,
}
new_header = []
@ -109,10 +107,10 @@ for file in files:
info[headitems[0]] = mappings[headitems[0]](headitems[1])
new_header.append(header)
if info['grid'] == [0,0,0]:
if numpy.all(info['grid'] == 0):
file['croak'].write('no grid info found.\n')
continue
if info['size'] == [0.0,0.0,0.0]:
if numpy.all(info['size'] == 0.0):
file['croak'].write('no size info found.\n')
continue
@ -124,13 +122,13 @@ for file in files:
'origin x y z: %s\n'%(' : '.join(map(str,info['origin']))) + \
'homogenization: %i\n'%info['homogenization'] + \
'microstructures: %i\n'%info['microstructures'])
file['output'].write('%i\theader\n'%(len(new_header))+''.join(new_header))
if info['microstructures'] > 0:
digits = 1+int(math.log10(int(info['microstructures'])))
else:
digits = 1+int(math.log10(int(info['grid'][0]*info['grid'][1]*info['grid'][2])))
file['output'].write('%i\theader\n'%(len(new_header))+''.join(new_header))
#--- unpack input ---------------------------------------------------------------------------------
wordsWritten = 0