Changeset 16311

Timestamp:

10/07/13 14:33:04 (11 years ago)

Author:

seroussi

Message:

NEW: test on IceVolumeAboveFloatation also in python tests

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test424.py (modified) (2 diffs)
• test426.py (modified) (2 diffs)

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

@@ -28 +28 @@
 
 #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,\
-        1e-13,1e-13,1e-13,1e-13,\
-        1e-13,1e-13,1e-13,1e-13]
+field_names     =['Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1',\
+        'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2',\
+        'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3']
+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]
 field_values=[\
         md.results.TransientSolution[0].Bed,\
@@ -39 +39 @@
         md.results.TransientSolution[0].Thickness,\
         md.results.TransientSolution[0].MaskGroundediceLevelset,\
+        md.results.TransientSolution[0].IceVolume,\
+        md.results.TransientSolution[0].IceVolumeAboveFloatation,\
         md.results.TransientSolution[1].Bed,\
         md.results.TransientSolution[1].Surface,\
         md.results.TransientSolution[1].Thickness,\
         md.results.TransientSolution[1].MaskGroundediceLevelset,\
+        md.results.TransientSolution[1].IceVolume,\
+        md.results.TransientSolution[1].IceVolumeAboveFloatation,\
         md.results.TransientSolution[2].Bed,\
         md.results.TransientSolution[2].Surface,\
         md.results.TransientSolution[2].Thickness,\
         md.results.TransientSolution[2].MaskGroundediceLevelset,\
+        md.results.TransientSolution[2].IceVolume,\
+        md.results.TransientSolution[2].IceVolumeAboveFloatation,\
         ]

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

@@ -29 +29 @@
 
 #Fields and tolerances to track changes
-field_names     =['Bed1','Surface1','Thickness1','Floatingice1',\
-        'Bed2','Surface2','Thickness2','Floatingice2',\
-        'Bed3','Surface3','Thickness3','Floatingice3']
+field_names     =['Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1',\
+        'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2',\
+        'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3',]
 
-field_tolerances=[1e-13,1e-13,1e-13,1e-13,\
-        1e-11,1e-10,1e-11,1.25e-11,\
-        1e-10,1e-10,1e-10,1.15e-11]
+field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
+        1e-11,1e-10,1e-11,1.25e-11,1e-13,1e-13,\
+        1e-10,1e-10,1e-10,1.15e-11,1e-13,1e-13]
 
 field_values=[\
@@ -42 +42 @@
         md.results.TransientSolution[0].Thickness,\
         md.results.TransientSolution[0].MaskGroundediceLevelset,\
+        md.results.TransientSolution[0].IceVolume,\
+        md.results.TransientSolution[0].IceVolumeAboveFloatation,\
         md.results.TransientSolution[1].Bed,\
         md.results.TransientSolution[1].Surface,\
         md.results.TransientSolution[1].Thickness,\
         md.results.TransientSolution[1].MaskGroundediceLevelset,\
+        md.results.TransientSolution[1].IceVolume,\
+        md.results.TransientSolution[1].IceVolumeAboveFloatation,\
         md.results.TransientSolution[2].Bed,\
         md.results.TransientSolution[2].Surface,\
         md.results.TransientSolution[2].Thickness,\
         md.results.TransientSolution[2].MaskGroundediceLevelset,\
+        md.results.TransientSolution[2].IceVolume,\
+        md.results.TransientSolution[2].IceVolumeAboveFloatation,\
         ]