Changeset 21729 for issm/trunk/test/NightlyRun/test427.py

Timestamp:

05/19/17 14:48:02 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21727

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test427.py (modified) (3 diffs)

issm/trunk/test/NightlyRun/test427.py

@@ -1 +1 @@
 #Test Name: SquareSheetShelfGroundingLine3dSoft
-import numpy
 from model import *
-from MatlabFuncs import *
-from triangle import *
+from socket import gethostname
+
 from setmask import *
 from parameterize import *
@@ -14 +13 @@
 md.initialization.vx[:]=0.
 md.initialization.vy[:]=0.
-md.geometry.base=-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
-md.geometry.bed =-700.-abs(md.mesh.y.reshape(-1,1)-500000.)/1000.
+md.geometry.base=-700.-abs(md.mesh.y-500000.)/1000.
+md.geometry.bed =-700.-abs(md.mesh.y-500000.)/1000.
 md.geometry.thickness[:]=1300
 md.geometry.surface=md.geometry.base+md.geometry.thickness
@@ -25 +24 @@
 md.transient.isgroundingline=True
 md.groundingline.migration='SoftMigration'
-md.cluster=generic('name',oshostname(),'np',3)
+md.cluster=generic('name',gethostname(),'np',3)
 md=solve(md,'Transient')
 
 #Fields and tolerances to track changes
-field_names     =['Bed1','Surface1','Thickness1','Floatingice1',\
-        'Bed2','Surface2','Thickness2','Floatingice2',\
-        'Bed3','Surface3','Thickness3','Floatingice3']
-field_tolerances=[1e-13,1e-13,1e-13,1e-13,\
-        5e-12,3e-12,7e-12,2e-11,\
-        1e-10,5e-11,1e-10,7e-10]
-field_values=[\
-        md.results.TransientSolution[0].Base,\
-        md.results.TransientSolution[0].Surface,\
-        md.results.TransientSolution[0].Thickness,\
-        md.results.TransientSolution[0].MaskGroundediceLevelset,\
-        md.results.TransientSolution[1].Base,\
-        md.results.TransientSolution[1].Surface,\
-        md.results.TransientSolution[1].Thickness,\
-        md.results.TransientSolution[1].MaskGroundediceLevelset,\
-        md.results.TransientSolution[2].Base,\
-        md.results.TransientSolution[2].Surface,\
-        md.results.TransientSolution[2].Thickness,\
-        md.results.TransientSolution[2].MaskGroundediceLevelset,\
-        ]
+field_names     =['Bed1','Surface1','Thickness1','Floatingice1',
+                                                                        'Bed2','Surface2','Thickness2','Floatingice2',
+                                                                        'Bed3','Surface3','Thickness3','Floatingice3']
+field_tolerances=[1e-13,1e-13,1e-13,1e-13,
+                                                                        5e-12,3e-12,7e-12,2e-11,
+                                                                        1e-10,5e-11,1e-10,7e-10]
+field_values=[md.results.TransientSolution[0].Base,
+                                                        md.results.TransientSolution[0].Surface,
+                                                        md.results.TransientSolution[0].Thickness,
+                                                        md.results.TransientSolution[0].MaskGroundediceLevelset,
+                                                        md.results.TransientSolution[1].Base,
+                                                        md.results.TransientSolution[1].Surface,
+                                                        md.results.TransientSolution[1].Thickness,
+                                                        md.results.TransientSolution[1].MaskGroundediceLevelset,
+                                                        md.results.TransientSolution[2].Base,
+                                                        md.results.TransientSolution[2].Surface,
+                                                        md.results.TransientSolution[2].Thickness,
+                                                        md.results.TransientSolution[2].MaskGroundediceLevelset]