Changeset 24313 for issm/trunk/test/NightlyRun/test275.py

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test275.py (modified) (2 diffs)

issm/trunk/test/NightlyRun/test275.py

@@ -1 @@
-#Test Name: SquareShelfDamageEvolutionSSA2dPralong 
+#Test Name: SquareShelfDamageEvolutionSSA2dPralong
 import numpy as np
 from triangle import triangle
@@ -6 +6 @@
 from setmask import setmask
 from parameterize import parameterize
-from verbose import verbose
 from setflowequation import setflowequation
 from generic import generic
-from socket import gethostname
 from solve import solve
 from matdamageice import matdamageice
 
-md=triangle(model(),'../Exp/Square.exp',150000.)
-md=setmask(md,'all','')
-md.materials=matdamageice()
-md=parameterize(md,'../Par/SquareShelf.py')
-md.damage.isdamage=1
-md.damage.D=0.1*np.ones(md.mesh.numberofvertices)
-md.damage.spcdamage=np.nan*np.ones(md.mesh.numberofvertices)
-md.damage.law=1
+md = triangle(model(), '../Exp/Square.exp', 150000.)
+md = setmask(md, 'all', '')
+md.materials = matdamageice()
+md = parameterize(md, '../Par/SquareShelf.py')
+md.damage.isdamage = 1
+md.damage.D = 0.1 * np.ones(md.mesh.numberofvertices)
+md.damage.spcdamage = np.nan * np.ones(md.mesh.numberofvertices)
+md.damage.law = 1
 
-md.damage.c1=1.e-11
-md.damage.c2=0.4
-md.damage.c3=1.e-3
-md.damage.healing=0.4
-md.damage.stress_threshold=1.e5
-md.damage.stabilization=1
+md.damage.c1 = 1.e-11
+md.damage.c2 = 0.4
+md.damage.c3 = 1.e-3
+md.damage.healing = 0.4
+md.damage.stress_threshold = 1.e5
+md.damage.stabilization = 1
 
-md.damage.requested_outputs=['default','DamageF']
+md.damage.requested_outputs = ['default', 'DamageF']
 
-md=setflowequation(md,'SSA','all')
-md.cluster=generic('name',gethostname(),'np',3)
-md=solve(md,'DamageEvolution')
+md = setflowequation(md, 'SSA', 'all')
+md.cluster = generic('name', gethostname(), 'np', 3)
+md = solve(md, 'DamageEvolution')
 
-field_names=['D','F']
-field_tolerances=[1.e-13,1.e-13]
-field_values=[md.results.DamageEvolutionSolution.DamageDbar,
-                                                        md.results.DamageEvolutionSolution.DamageF]
+field_names = ['D', 'F']
+field_tolerances = [1.e-13, 1.e-13]
+field_values = [md.results.DamageEvolutionSolution.DamageDbar,
+                md.results.DamageEvolutionSolution.DamageF]