Changeset 23656

Timestamp:

01/24/19 08:12:37 (6 years ago)

Author:

Mathieu Morlighem

Message:

BUG: trying to fix py tests

Location:

issm/trunk-jpl/test

Files:

• NightlyRun/test801.py (modified) (2 diffs)
• Par/ValleyGlacierShelf.py (modified) (1 diff)

issm/trunk-jpl/test/NightlyRun/test801.py

@@ -7 +7 @@
 from setflowequation import *
 from solve import *
-
 
 md=triangle(model(),'../Exp/Square.exp',50000)
@@ -29 +28 @@
 #Fields and tolerances to track changes
 field_names     =['Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1',
-                                                                        'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2',
-                                                                        'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3']
+        'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2',
+        'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3']
 field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,
-                                                                        1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,
-                                                                        1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12]
+        1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,
+        1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12]
 field_values=[md.results.TransientSolution[0].Vx,
-                                                        md.results.TransientSolution[0].Vy,
-                                                        md.results.TransientSolution[0].Vel,
-                                                        md.results.TransientSolution[0].Pressure,
-                                                        md.results.TransientSolution[0].Thickness,
-                                                        md.results.TransientSolution[0].Surface,
-                                                        md.results.TransientSolution[0].MaskIceLevelset,
-                                                        md.results.TransientSolution[1].Vx,
-                                                        md.results.TransientSolution[1].Vy,
-                                                        md.results.TransientSolution[1].Vel,
-                                                        md.results.TransientSolution[1].Pressure,
-                                                        md.results.TransientSolution[1].Thickness,
-                                                        md.results.TransientSolution[1].Surface,
-                                                        md.results.TransientSolution[1].MaskIceLevelset,
-                                                        md.results.TransientSolution[2].Vx,
-                                                        md.results.TransientSolution[2].Vy,
-                                                        md.results.TransientSolution[2].Vel,
-                                                        md.results.TransientSolution[2].Pressure,
-                                                        md.results.TransientSolution[2].Thickness,
-                                                        md.results.TransientSolution[2].Surface,
-                                                        md.results.TransientSolution[2].MaskIceLevelset]
+        md.results.TransientSolution[0].Vy,
+        md.results.TransientSolution[0].Vel,
+        md.results.TransientSolution[0].Pressure,
+        md.results.TransientSolution[0].Thickness,
+        md.results.TransientSolution[0].Surface,
+        md.results.TransientSolution[0].MaskIceLevelset,
+        md.results.TransientSolution[1].Vx,
+        md.results.TransientSolution[1].Vy,
+        md.results.TransientSolution[1].Vel,
+        md.results.TransientSolution[1].Pressure,
+        md.results.TransientSolution[1].Thickness,
+        md.results.TransientSolution[1].Surface,
+        md.results.TransientSolution[1].MaskIceLevelset,
+        md.results.TransientSolution[2].Vx,
+        md.results.TransientSolution[2].Vy,
+        md.results.TransientSolution[2].Vel,
+        md.results.TransientSolution[2].Pressure,
+        md.results.TransientSolution[2].Thickness,
+        md.results.TransientSolution[2].Surface,
+        md.results.TransientSolution[2].MaskIceLevelset]

issm/trunk-jpl/test/Par/ValleyGlacierShelf.py

@@ -82 +82 @@
 #Masstransport
 md.calving.calvingrate=0.*numpy.ones((md.mesh.numberofvertices))
-md.calving.meltingrate=0.*numpy.ones((md.mesh.numberofvertices))
+md.frontalforcings.meltingrate = 0.*numpy.ones((md.mesh.numberofvertices))
 md.levelset.spclevelset=float('NaN')*numpy.ones((md.mesh.numberofvertices))
 md.masstransport.stabilization=1.