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

geom packing/unpacking won't throw away unknown header information any more (might contain comments)

This commit is contained in:
Martin Diehl 2013-04-12 10:47:44 +00:00
parent 0b1033d63a
commit 6f0308844f
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
processing/pre/geom_pack.py
View File

@ -75,7 +75,7 @@ for file in files:
m = re.search('(\d+)\s*head', firstline.lower()) m = re.search('(\d+)\s*head', firstline.lower())
if m: if m:
headerlines = int(m.group(1)) headerlines = int(m.group(1))
headers = [firstline]+[file['input'].readline() for i in range(headerlines)] headers = [file['input'].readline() for i in range(headerlines)]
else: else:
headerlines = 1 headerlines = 1
headers = firstline headers = firstline
@ -102,6 +102,7 @@ for file in files:
mappings[headitems[0]](headitems[headitems.index(identifiers[headitems[0]][i])+1]) mappings[headitems[0]](headitems[headitems.index(identifiers[headitems[0]][i])+1])
else: else:
info[headitems[0]] = mappings[headitems[0]](headitems[1]) info[headitems[0]] = mappings[headitems[0]](headitems[1])
new_header.append(header)
if info['grid'] == [0,0,0]: if info['grid'] == [0,0,0]:
file['croak'].write('no grid info found.\n') file['croak'].write('no grid info found.\n')
@ -115,22 +116,6 @@ for file in files:
'origin x y z: %s\n'%(' : '.join(map(str,info['origin']))) + \ 'origin x y z: %s\n'%(' : '.join(map(str,info['origin']))) + \
'homogenization: %i\n'%info['homogenization'] + \ 'homogenization: %i\n'%info['homogenization'] + \
'microstructures: %i\n'%info['microstructures']) 'microstructures: %i\n'%info['microstructures'])
new_header.append("grid\ta %i\tb %i\tc %i\n"%(
info['grid'][0],
info['grid'][1],
info['grid'][2],))
new_header.append("size\tx %f\ty %f\tz %f\n"%(
info['size'][0],
info['size'][1],
info['size'][2]))
new_header.append("origin\tx %f\ty %f\tz %f\n"%(
info['origin'][0],
info['origin'][1],
info['origin'][2]))
new_header.append("homogenization\t%i\n"%info['homogenization'])
if info['microstructures'] > 0:
new_header.append("microstructures\t%i\n"%info['microstructures'])
# ------------------------------------------ assemble header --------------------------------------- # ------------------------------------------ assemble header ---------------------------------------

17
processing/pre/geom_unpack.py
View File

@ -81,7 +81,7 @@ for file in files:
m = re.search('(\d+)\s*head', firstline.lower()) m = re.search('(\d+)\s*head', firstline.lower())
if m: if m:
headerlines = int(m.group(1)) headerlines = int(m.group(1))
headers = [firstline]+[file['input'].readline() for i in range(headerlines)] headers = [file['input'].readline() for i in range(headerlines)]
else: else:
headerlines = 1 headerlines = 1
headers = firstline headers = firstline
@ -108,6 +108,7 @@ for file in files:
mappings[headitems[0]](headitems[headitems.index(identifiers[headitems[0]][i])+1]) mappings[headitems[0]](headitems[headitems.index(identifiers[headitems[0]][i])+1])
else: else:
info[headitems[0]] = mappings[headitems[0]](headitems[1]) info[headitems[0]] = mappings[headitems[0]](headitems[1])
new_header.append(header)
if info['grid'] == [0,0,0]: if info['grid'] == [0,0,0]:
file['croak'].write('no grid info found.\n') file['croak'].write('no grid info found.\n')
@ -125,21 +126,7 @@ for file in files:
'homogenization: %i\n'%info['homogenization'] + \ 'homogenization: %i\n'%info['homogenization'] + \
'microstructures: %i\n'%info['microstructures']) 'microstructures: %i\n'%info['microstructures'])
new_header.append("grid\ta %i\tb %i\tc %i\n"%(
info['grid'][0],
info['grid'][1],
info['grid'][2],))
new_header.append("size\tx %f\ty %f\tz %f\n"%(
info['size'][0],
info['size'][1],
info['size'][2]))
new_header.append("origin\tx %f\ty %f\tz %f\n"%(
info['origin'][0],
info['origin'][1],
info['origin'][2]))
new_header.append("homogenization\t%i\n"%info['homogenization'])
if info['microstructures'] > 0: if info['microstructures'] > 0:
new_header.append("microstructures\t%i\n"%info['microstructures'])
digits = 1+int(math.log10(int(info['microstructures']))) digits = 1+int(math.log10(int(info['microstructures'])))
else: else:
digits = 1+int(math.log10(int(info['grid'][0]*info['grid'][1]*info['grid'][2]))) digits = 1+int(math.log10(int(info['grid'][0]*info['grid'][1]*info['grid'][2])))