Changeset 19522

Timestamp:

08/26/15 10:56:54 (10 years ago)

Author:

seroussi

Message:

BUG: fixed python NR

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test314.py (modified) (4 diffs)
• test317.py (modified) (4 diffs)
• test408.py (modified) (4 diffs)
• test409.py (modified) (4 diffs)

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

@@ -14 +14 @@
 md=setflowequation(md,'SIA','all')
 md.cluster=generic('name',oshostname(),'np',3)
+md.transient.requested_outputs=['default','GroundedArea','IceVolume']
 md=solve(md,TransientSolutionEnum())
 
 #Fields and tolerances to track changes
-field_names     =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3']
-field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
+field_names     =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','GroundedArea1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','GroundedArea2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','GroundedArea3']
+field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
 field_values=[\
         md.results.TransientSolution[0].Vx,\
@@ -27 +28 @@
         md.results.TransientSolution[0].Surface,\
         md.results.TransientSolution[0].Thickness,\
+        md.results.TransientSolution[0].GroundedArea,\
         md.results.TransientSolution[1].Vx,\
         md.results.TransientSolution[1].Vy,\
@@ -34 +36 @@
         md.results.TransientSolution[1].Surface,\
         md.results.TransientSolution[1].Thickness,\
+        md.results.TransientSolution[1].GroundedArea,\
         md.results.TransientSolution[2].Vx,\
         md.results.TransientSolution[2].Vy,\
@@ -41 +44 @@
         md.results.TransientSolution[2].Surface,\
         md.results.TransientSolution[2].Thickness,\
+        md.results.TransientSolution[2].GroundedArea,\
         ]

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

@@ -15 +15 @@
 md=setflowequation(md,'HO','all')
 md.cluster=generic('name',oshostname(),'np',3)
+md.transient.requested_outputs=['default','GroundedArea']
 md=solve(md,TransientSolutionEnum())
 
 #Fields and tolerances to track changes
-field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1',\
-        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2',\
-        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
-field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\
-                1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\
-                1e-09,5e-10,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10]
+field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','GroundedArea1',\
+        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','GroundedArea2',\
+        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','GroundedArea3']
+field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12\
+                1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12,\
+                1e-09,5e-10,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-12]
 field_values=[\
         md.results.TransientSolution[0].Vx,\
@@ -35 +36 @@
         md.results.TransientSolution[0].Temperature,\
         md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
+        md.results.TransientSolution[0].GroundedArea,\
         md.results.TransientSolution[1].Vx,\
         md.results.TransientSolution[1].Vy,\
@@ -45 +47 @@
         md.results.TransientSolution[1].Temperature,\
         md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
+        md.results.TransientSolution[1].GroundedArea,\
         md.results.TransientSolution[2].Vx,\
         md.results.TransientSolution[2].Vy,\
@@ -55 +58 @@
         md.results.TransientSolution[2].Temperature,\
         md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
+        md.results.TransientSolution[2].GroundedArea,\
         ]

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

@@ -15 +15 @@
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',oshostname(),'np',3)
+md.transient.requested_outputs=['default','GroundedArea']
 md=solve(md,TransientSolutionEnum())
 
 #Fields and tolerances to track changes
-field_names     =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3']
-field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
+field_names     =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','GroundedArea1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','GroundedArea2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','GroundedArea3']
+field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
 field_values=[\
         md.results.TransientSolution[0].Vx,\
@@ -28 +29 @@
         md.results.TransientSolution[0].Surface,\
         md.results.TransientSolution[0].Thickness,\
+        md.results.TransientSolution[0].GroundedArea,\
         md.results.TransientSolution[1].Vx,\
         md.results.TransientSolution[1].Vy,\
@@ -35 +37 @@
         md.results.TransientSolution[1].Surface,\
         md.results.TransientSolution[1].Thickness,\
+        md.results.TransientSolution[1].GroundedArea,\
         md.results.TransientSolution[2].Vx,\
         md.results.TransientSolution[2].Vy,\
@@ -42 +45 @@
         md.results.TransientSolution[2].Surface,\
         md.results.TransientSolution[2].Thickness,\
+        md.results.TransientSolution[1].GroundedArea,\
         ]

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

@@ -16 +16 @@
 md=setflowequation(md,'SSA','../Exp/SquareHalfRight.exp','fill','HO','coupling','penalties')
 md.cluster=generic('name',oshostname(),'np',3)
+md.transient.requested_outputs=['default','GroundedArea'];
 md=solve(md,TransientSolutionEnum())
 
 #Fields and tolerances to track changes
-field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
-                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \
-                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
+field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','GroundedArea1', \
+                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','GroundedArea2', \
+                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','GroundedArea3']
 field_tolerances=[\
-        1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,\
-        1e-03,1e-03,1e-02,1e-03,1e-02,1e-04,1e-01,1e-03,1e-01,1e-01,\
-        1e-02,1e-02,1e-01,1e-02,1e-01,1e-04,1e-04,1e-04,1e-04,1e-01]
+        1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-13,\
+        1e-03,1e-03,1e-02,1e-03,1e-02,1e-04,1e-01,1e-03,1e-01,1e-01,1e-13,\
+        1e-02,1e-02,1e-01,1e-02,1e-01,1e-04,1e-04,1e-04,1e-04,1e-01,1e-13]
 field_values=[\
         md.results.TransientSolution[0].Vx,\
@@ -37 +38 @@
         md.results.TransientSolution[0].Temperature,\
         md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
+        md.results.TransientSolution[0].GroundedArea,\
         md.results.TransientSolution[1].Vx,\
         md.results.TransientSolution[1].Vy,\
@@ -47 +49 @@
         md.results.TransientSolution[1].Temperature,\
         md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
+        md.results.TransientSolution[1].GroundedArea,\
         md.results.TransientSolution[2].Vx,\
         md.results.TransientSolution[2].Vy,\
@@ -57 +60 @@
         md.results.TransientSolution[2].Temperature,\
         md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
+        md.results.TransientSolution[2].GroundedArea,\
         ]