Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 0f0c9f88 authored by Martin Genet's avatar Martin Genet
Browse files

Choice between Iref & Iold residual; New print mechanism; Choice between... 

Choice between Iref & Iold residual; New print mechanism; Choice between residual, displacement and image error
parent c92df657
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
fedic.py
+ 180
− 133
View file @ 0f0c9f88
This diff is collapsed.
image_expressions.py
+ 20
− 27
View file @ 0f0c9f88
...@@ -36,14 +36,11 @@ class ExprIm2(dolfin.Expression): ...@@ -36,14 +36,11 @@ class ExprIm2(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
#print self.s
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=0., out_value=0.,
verbose=0) verbose=0)
#print "ExprIm2.interpolator.GetNumberOfComponents() = " + str(self.interpolator.GetNumberOfComponents())
#print "ExprIm2.interpolator.GetOutValue() = " + str(self.interpolator.GetOutValue())
def eval(self, Expr, X): def eval(self, Expr, X):
#print "Expr" #print "Expr"
...@@ -64,8 +61,7 @@ class ExprIm3(dolfin.Expression): ...@@ -64,8 +61,7 @@ class ExprIm3(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
#print self.s
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=0., out_value=0.,
...@@ -90,16 +86,14 @@ class ExprGradIm2(dolfin.Expression): ...@@ -90,16 +86,14 @@ class ExprGradIm2(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
self.image = myVTK.computeImageGradient( self.image = myVTK.computeImageGradient(
image=self.image, image=self.image,
verbose=0) verbose=0)
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=1., out_value=self.s,
verbose=0) verbose=0)
#print "ExprGradIm2.interpolator.GetNumberOfComponents() = " + str(self.interpolator.GetNumberOfComponents())
#print "ExprGradIm2.interpolator.GetOutValue() = " + str(self.interpolator.GetOutValue())
def value_shape(self): def value_shape(self):
return (2,) return (2,)
...@@ -119,13 +113,13 @@ class ExprGradIm3(dolfin.Expression): ...@@ -119,13 +113,13 @@ class ExprGradIm3(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
self.image = myVTK.computeImageGradient( self.image = myVTK.computeImageGradient(
image=self.image, image=self.image,
verbose=0) verbose=0)
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=1., out_value=self.s,
verbose=0) verbose=0)
def value_shape(self): def value_shape(self):
...@@ -146,13 +140,13 @@ class ExprHessIm2(dolfin.Expression): ...@@ -146,13 +140,13 @@ class ExprHessIm2(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
self.image = myVTK.computeImageHessian( self.image = myVTK.computeImageHessian(
image=self.image, image=self.image,
verbose=0) verbose=0)
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=1., out_value=self.s,
verbose=0) verbose=0)
def value_shape(self): def value_shape(self):
...@@ -173,13 +167,13 @@ class ExprHessIm3(dolfin.Expression): ...@@ -173,13 +167,13 @@ class ExprHessIm3(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
self.image = myVTK.computeImageHessian( self.image = myVTK.computeImageHessian(
image=self.image, image=self.image,
verbose=0) verbose=0)
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=1., out_value=self.s,
verbose=0) verbose=0)
def value_shape(self): def value_shape(self):
...@@ -202,7 +196,7 @@ class ExprDefIm2(dolfin.Expression): ...@@ -202,7 +196,7 @@ class ExprDefIm2(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=0., out_value=0.,
...@@ -236,8 +230,7 @@ class ExprDefIm3(dolfin.Expression): ...@@ -236,8 +230,7 @@ class ExprDefIm3(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
#print self.s
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=0., out_value=0.,
...@@ -271,13 +264,13 @@ class ExprGradDefIm2(dolfin.Expression): ...@@ -271,13 +264,13 @@ class ExprGradDefIm2(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
self.image = myVTK.computeImageGradient( self.image = myVTK.computeImageGradient(
image=self.image, image=self.image,
verbose=0) verbose=0)
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=1., out_value=self.s,
verbose=0) verbose=0)
def value_shape(self): def value_shape(self):
...@@ -311,13 +304,13 @@ class ExprGradDefIm3(dolfin.Expression): ...@@ -311,13 +304,13 @@ class ExprGradDefIm3(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
self.image = myVTK.computeImageGradient( self.image = myVTK.computeImageGradient(
image=self.image, image=self.image,
verbose=0) verbose=0)
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=1., out_value=self.s,
verbose=0) verbose=0)
def value_shape(self): def value_shape(self):
...@@ -351,13 +344,13 @@ class ExprHessDefIm2(dolfin.Expression): ...@@ -351,13 +344,13 @@ class ExprHessDefIm2(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
self.image = myVTK.computeImageHessian( self.image = myVTK.computeImageHessian(
image=self.image, image=self.image,
verbose=0) verbose=0)
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=1., out_value=self.s,
verbose=0) verbose=0)
def value_shape(self): def value_shape(self):
...@@ -382,13 +375,13 @@ class ExprHessDefIm3(dolfin.Expression): ...@@ -382,13 +375,13 @@ class ExprHessDefIm3(dolfin.Expression):
filename=filename, filename=filename,
verbose=0) verbose=0)
self.s = getScalingFactor( self.s = getScalingFactor(
self.image.GetScalarTypeAsString()) scalar_type_as_string=self.image.GetScalarTypeAsString())
self.image = myVTK.computeImageHessian( self.image = myVTK.computeImageHessian(
image=self.image, image=self.image,
verbose=0) verbose=0)
self.interpolator = myVTK.createImageInterpolator( self.interpolator = myVTK.createImageInterpolator(
image=self.image, image=self.image,
out_value=1., out_value=self.s,
verbose=0) verbose=0)
def value_shape(self): def value_shape(self):
......
plot_strains.py
+ 1
− 1
View file @ 0f0c9f88
...@@ -52,7 +52,7 @@ set linestyle 7 pointtype 1 ...@@ -52,7 +52,7 @@ set linestyle 7 pointtype 1
set linestyle 8 pointtype 1 set linestyle 8 pointtype 1
set linestyle 9 pointtype 1 set linestyle 9 pointtype 1
set key box textcolor variable width +0 set key box textcolor variable width +1
set grid set grid
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment