better reporting and fixed a bug when requesting non-existing data

This commit is contained in:
Philip Eisenlohr 2011-05-21 21:43:40 +00:00
parent a910c469df
commit 8879e03a60
1 changed files with 25 additions and 11 deletions

View File

@ -397,16 +397,29 @@ for filename in args:
ms = postprocessingMath.mesh(res[0],res[1],res[2],dim,defgrad_av,centroids) ms = postprocessingMath.mesh(res[0],res[1],res[2],dim,defgrad_av,centroids)
fields = {\ fields = {\
'tensors': {},\ 'tensor': {},\
'vectors': {},\ 'vector': {},\
'scalars': {},\ 'scalar': {},\
} }
for me in options.tensor: reshape = {\
fields['tensors'][me] = numpy.reshape(values[:,column['tensor'][me]:column['tensor'][me]+9],(res[0],res[1],res[2],3,3)) 'tensor': (3,3),\
for me in options.vector: 'vector': (3),\
fields['vectors'][me] = numpy.reshape(values[:,column['vector'][me]:column['vector'][me]+3],(res[0],res[1],res[2],3)) 'scalar': (),\
for me in options.scalar: }
fields['scalars'][me] = numpy.reshape(values[:,column['scalar'][me]],(res[0],res[1],res[2])) length = {\
'tensor': 9,\
'vector': 3,\
'scalar': 1,\
}
for datatype in fields.keys():
print '\n%s:'%datatype,
for what in eval('options.%s'%datatype):
col = column[datatype][what]
if col != -1:
print what,
fields[datatype][what] = numpy.reshape(values[:,col:col+length[datatype]],(res[0],res[1],res[2])+reshape[datatype])
print '\n\n'
out = {} out = {}
out['mesh'] = vtk_writeASCII_mesh(ms,fields,res) out['mesh'] = vtk_writeASCII_mesh(ms,fields,res)
@ -414,6 +427,7 @@ for filename in args:
out['box'] = vtk_writeASCII_box(dim,defgrad_av) out['box'] = vtk_writeASCII_box(dim,defgrad_av)
for what in out.keys(): for what in out.keys():
print what
vtk = open('%s_'%what+os.path.splitext(filename)[0]+'.vtk', 'w') vtk = open('%s_'%what+os.path.splitext(filename)[0]+'.vtk', 'w')
output(out[what],{'filepointer':vtk},'File') output(out[what],{'filepointer':vtk},'File')
vtk.close() vtk.close()