Changeset 13975 for issm/trunk/test/NightlyRun/test122.py

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (2 props)
• test/NightlyRun/test122.py (modified) (3 diffs)

issm/trunk/test/NightlyRun/test122.py

@@ -11 +11 @@
 md=setmask(md,'all','')
 md=parameterize(md,'../Par/SquareShelfConstrained.py')
-md.extrude(3,1)
+md.extrude(3,1.)
 md=setflowequation(md,'pattyn','all')
-md.initialization.waterfraction=numpy.zeros(md.mesh.numberofvertices)
+md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,1))
 md.thermal.isenthalpy=1
 md.thermal.stabilization=2
@@ -21 +21 @@
 #Fields and tolerances to track changes
 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','Enthalpy1','Waterfraction1',\
-                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2',\
-                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3']
+        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','Enthalpy2','Waterfraction2',\
+        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','Enthalpy3','Waterfraction3']
 field_tolerances=[\
         1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\
@@ -28 +28 @@
         1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09]
 field_values=[\
-        md.results['TransientSolution'][1]['Vx'],\
-        md.results['TransientSolution'][1]['Vy'],\
-        md.results['TransientSolution'][1]['Vz'],\
-        md.results['TransientSolution'][1]['Vel'],\
-        md.results['TransientSolution'][1]['Pressure'],\
-        md.results['TransientSolution'][1]['Bed'],\
-        md.results['TransientSolution'][1]['Surface'],\
-        md.results['TransientSolution'][1]['Thickness'],\
-        md.results['TransientSolution'][1]['Temperature'],\
-        md.results['TransientSolution'][1]['Enthalpy'],\
-        md.results['TransientSolution'][1]['Waterfraction'],\
-        md.results['TransientSolution'][2]['Vx'],\
-        md.results['TransientSolution'][2]['Vy'],\
-        md.results['TransientSolution'][2]['Vz'],\
-        md.results['TransientSolution'][2]['Vel'],\
-        md.results['TransientSolution'][2]['Pressure'],\
-        md.results['TransientSolution'][2]['Bed'],\
-        md.results['TransientSolution'][2]['Surface'],\
-        md.results['TransientSolution'][2]['Thickness'],\
-        md.results['TransientSolution'][2]['Temperature'],\
-        md.results['TransientSolution'][2]['Enthalpy'],\
-        md.results['TransientSolution'][2]['Waterfraction'],\
-        md.results['TransientSolution'][3]['Vx'],\
-        md.results['TransientSolution'][3]['Vy'],\
-        md.results['TransientSolution'][3]['Vz'],\
-        md.results['TransientSolution'][3]['Vel'],\
-        md.results['TransientSolution'][3]['Pressure'],\
-        md.results['TransientSolution'][3]['Bed'],\
-        md.results['TransientSolution'][3]['Surface'],\
-        md.results['TransientSolution'][3]['Thickness'],\
-        md.results['TransientSolution'][3]['Temperature'],\
-        md.results['TransientSolution'][3]['Enthalpy'],\
-        md.results['TransientSolution'][3]['Waterfraction'],\
+        md.results.TransientSolution[0].Vx,\
+        md.results.TransientSolution[0].Vy,\
+        md.results.TransientSolution[0].Vz,\
+        md.results.TransientSolution[0].Vel,\
+        md.results.TransientSolution[0].Pressure,\
+        md.results.TransientSolution[0].Bed,\
+        md.results.TransientSolution[0].Surface,\
+        md.results.TransientSolution[0].Thickness,\
+        md.results.TransientSolution[0].Temperature,\
+        md.results.TransientSolution[0].Enthalpy,\
+        md.results.TransientSolution[0].Waterfraction,\
+        md.results.TransientSolution[1].Vx,\
+        md.results.TransientSolution[1].Vy,\
+        md.results.TransientSolution[1].Vz,\
+        md.results.TransientSolution[1].Vel,\
+        md.results.TransientSolution[1].Pressure,\
+        md.results.TransientSolution[1].Bed,\
+        md.results.TransientSolution[1].Surface,\
+        md.results.TransientSolution[1].Thickness,\
+        md.results.TransientSolution[1].Temperature,\
+        md.results.TransientSolution[1].Enthalpy,\
+        md.results.TransientSolution[1].Waterfraction,\
+        md.results.TransientSolution[2].Vx,\
+        md.results.TransientSolution[2].Vy,\
+        md.results.TransientSolution[2].Vz,\
+        md.results.TransientSolution[2].Vel,\
+        md.results.TransientSolution[2].Pressure,\
+        md.results.TransientSolution[2].Bed,\
+        md.results.TransientSolution[2].Surface,\
+        md.results.TransientSolution[2].Thickness,\
+        md.results.TransientSolution[2].Temperature,\
+        md.results.TransientSolution[2].Enthalpy,\
+        md.results.TransientSolution[2].Waterfraction,\
         ]