debugging of addDebugInformation (now working, but not tested in detail)
Added Id to postprocessingMath
This commit is contained in:
parent
7aba05ed9f
commit
eb0ce3992b
|
@ -66,10 +66,12 @@ if not options.res or len(options.res) < 3:
|
||||||
if not options.dim or len(options.dim) < 3:
|
if not options.dim or len(options.dim) < 3:
|
||||||
parser.error('improper dimension specification...')
|
parser.error('improper dimension specification...')
|
||||||
|
|
||||||
defgrad = {}
|
defgrad = {}
|
||||||
defgrad_av = {}
|
defgrad_av = {}
|
||||||
centroids = {}
|
centroids = {}
|
||||||
nodes = {}
|
nodes = {}
|
||||||
|
shape_mismatch = {}
|
||||||
|
volume_mismatch= {}
|
||||||
|
|
||||||
datainfo = { # list of requested labels per datatype
|
datainfo = { # list of requested labels per datatype
|
||||||
'defgrad': {'len':9,
|
'defgrad': {'len':9,
|
||||||
|
@ -128,8 +130,8 @@ for file in files:
|
||||||
if datatype not in column: column[datatype] = {}
|
if datatype not in column: column[datatype] = {}
|
||||||
active[datatype].append(label)
|
active[datatype].append(label)
|
||||||
column[datatype][label] = headers.index(key)
|
column[datatype][label] = headers.index(key)
|
||||||
if options.shape: head += 'mismatch_shape(%s)'%label
|
if options.shape: head += ['mismatch_shape(%s)'%label]
|
||||||
if options.volume: head += 'mismatch_volume(%s)'%label
|
if options.volume: head += ['mismatch_volume(%s)'%label]
|
||||||
|
|
||||||
# ------------------------------------------ assemble header ---------------------------------------
|
# ------------------------------------------ assemble header ---------------------------------------
|
||||||
|
|
||||||
|
@ -158,12 +160,12 @@ for file in files:
|
||||||
[location(idx,options.res)[2]]\
|
[location(idx,options.res)[2]]\
|
||||||
= numpy.array(map(float,items[column[datatype][label]:
|
= numpy.array(map(float,items[column[datatype][label]:
|
||||||
column[datatype][label]+datainfo[datatype]['len']]),'d').reshape(3,3)
|
column[datatype][label]+datainfo[datatype]['len']]),'d').reshape(3,3)
|
||||||
defgrad_av[label] = postprocessingMath.tensor_avg(options.res[0],options.res[1],options.res[2],defgrad[label])
|
|
||||||
centroids[label] = postprocessingMath.deformed_fft(options.res[0],options.res[1],options.res[2],options.dim,defgrad[label],defgrad_av[label],1.0)
|
|
||||||
nodes[label] = postprocessingMath.mesh(options.res[0],options.res[1],options.res[2],options.dim,defgrad_av[label],centroids[label])
|
|
||||||
if options.shape: shape_mismatch[label] = postprocessingMath.shape_compare( options.res[0],options.res[1],options.res[2],options.dim,nodes[label],centroids[label],defgrad[label])
|
|
||||||
if options.volume: volume_mismatch[label] = postprocessingMath.volume_compare(options.res[0],options.res[1],options.res[2],options.dim,nodes[label], defgrad[label])
|
|
||||||
idx += 1
|
idx += 1
|
||||||
|
defgrad_av[label] = postprocessingMath.tensor_avg(options.res[0],options.res[1],options.res[2],defgrad[label])
|
||||||
|
centroids[label] = postprocessingMath.deformed_fft(options.res[0],options.res[1],options.res[2],options.dim,defgrad[label],defgrad_av[label],1.0)
|
||||||
|
nodes[label] = postprocessingMath.mesh(options.res[0],options.res[1],options.res[2],options.dim,defgrad_av[label],centroids[label])
|
||||||
|
if options.shape: shape_mismatch[label] = postprocessingMath.shape_compare( options.res[0],options.res[1],options.res[2],options.dim,nodes[label],centroids[label],defgrad[label])
|
||||||
|
if options.volume: volume_mismatch[label] = postprocessingMath.volume_compare(options.res[0],options.res[1],options.res[2],options.dim,nodes[label], defgrad[label])
|
||||||
|
|
||||||
# ------------------------------------------ read file ---------------------------------------
|
# ------------------------------------------ read file ---------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
$Id$
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# This script is used to compile the python module used for geometry reconstruction.
|
# This script is used to compile the python module used for geometry reconstruction.
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,6 +1,6 @@
|
||||||
|
! $Id$
|
||||||
! -*- f90 -*-
|
! -*- f90 -*-
|
||||||
! Note: the context of this file is case sensitive.
|
! Note: the context of this file is case sensitive.
|
||||||
|
|
||||||
python module postprocessingMath ! in
|
python module postprocessingMath ! in
|
||||||
interface ! in :postprocessingMath
|
interface ! in :postprocessingMath
|
||||||
module math ! in :postprocessingMath:postprocessingMath.f90
|
module math ! in :postprocessingMath:postprocessingMath.f90
|
||||||
|
|
Loading…
Reference in New Issue