Changeset 18301 for issm/trunk/test/NightlyRun/test209.py

Timestamp:

07/30/14 14:22:43 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 18299

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test209.py (modified) (4 diffs)

issm/trunk/test/NightlyRun/test209.py

@@ -21 +21 @@
 # Fields and tolerances to track changes
 
-field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
-        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
-        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
+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-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,\
@@ -39 +39 @@
         md.results.TransientSolution[0].Thickness,\
         md.results.TransientSolution[0].Temperature,\
-        md.results.TransientSolution[0].BasalforcingsMeltingRate,\
+        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
         md.results.TransientSolution[1].Vx,\
         md.results.TransientSolution[1].Vy,\
@@ -49 +49 @@
         md.results.TransientSolution[1].Thickness,\
         md.results.TransientSolution[1].Temperature,\
-        md.results.TransientSolution[1].BasalforcingsMeltingRate,\
+        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
         md.results.TransientSolution[2].Vx,\
         md.results.TransientSolution[2].Vy,\
@@ -59 +59 @@
         md.results.TransientSolution[2].Thickness,\
         md.results.TransientSolution[2].Temperature,\
-        md.results.TransientSolution[2].BasalforcingsMeltingRate,\
+        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
         ]