Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test273.py

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test273.py (modified) (4 diffs)

issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test273.py

@@ -1 +1 @@
 #Test Name: SquareShelfStressSSA2dDamageUpdate
-import numpy
-from model import model
+import numpy as np
+from model import *
+from socket import gethostname
 from triangle import triangle
 from setmask import setmask
@@ -9 +10 @@
 from matdamageice import matdamageice
 from generic import generic
-from socket import gethostname as oshostname
+from socket import gethostname
 
 md=triangle(model(),'../Exp/Square.exp',150000.)
@@ -16 +17 @@
 md=parameterize(md,'../Par/SquareShelf.py')
 md.damage.isdamage=1
-md.damage.D=0.*numpy.ones(md.mesh.numberofvertices)
-md.damage.spcdamage=numpy.nan*numpy.ones(md.mesh.numberofvertices)
+md.damage.D=0.*np.ones(md.mesh.numberofvertices)
+md.damage.spcdamage=np.nan*np.ones(md.mesh.numberofvertices)
 md=setflowequation(md,'SSA','all')
-md.cluster=generic('name',oshostname(),'np',3)
+md.cluster=generic('name',gethostname(),'np',3)
 
 md.stressbalance.requested_outputs=['default','NewDamage']
@@ -30 +31 @@
 field_names     =['Vx','Vy','Vel','Pressure','NewDamage']
 field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13]
-field_values=[\
-        md.results.StressbalanceSolution.Vx,\
-        md.results.StressbalanceSolution.Vy,\
-        md.results.StressbalanceSolution.Vel,\
-        md.results.StressbalanceSolution.Pressure,\
-        md.results.StressbalanceSolution.NewDamage,\
-        ]
+field_values=[md.results.StressbalanceSolution.Vx,
+                                                        md.results.StressbalanceSolution.Vy,
+                                                        md.results.StressbalanceSolution.Vel,
+                                                        md.results.StressbalanceSolution.Pressure,
+                                                        md.results.StressbalanceSolution.NewDamage]