Changeset 26687

Timestamp:

12/01/21 19:05:58 (3 years ago)

Author:

seroussi

Message:

BUG: fixed minor problem with new scalars in tests

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test540.m (modified) (1 diff)
• test540.py (modified) (1 diff)
• test541.m (modified) (2 diffs)
• test541.py (modified) (1 diff)

issm/trunk-jpl/test/NightlyRun/test540.m

@@ -35 +35 @@
 field_tolerances={...
         1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,...
-        1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,...
+        1e-12,2e-12,2e-12,1e-13,1e-13,...
         1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-12,...
-        1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,...
+        1e-12,2e-12,2e-12,1e-13,1e-13,...
         1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-9,...
-        1e-12,2e-12,2e-12,1e-13,1e-13,1e-13,1e-13,1e-13,...
+        1e-12,2e-12,2e-12,1e-13,1e-13,...
         };
 field_values={...

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

@@ -42 +42 @@
                'IceVolume10', 'IceVolumeAboveFloatation10', 'TotalSmb10', 'TotalGroundedBmb10', 'TotalFloatingBmb10']
 field_tolerances = [1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
-                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
+                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13,
                     1e-12, 1e-12, 1e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-12,
-                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
+                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13,
                     1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-9,
-                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13]
+                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13]
 field_values = [md.results.TransientSolution[0].Vx,
                 md.results.TransientSolution[0].Vy,

issm/trunk-jpl/test/NightlyRun/test541.m

@@ -28 +28 @@
         'Vx1' ,'Vy1' ,'Vel1' ,'Pressure1' ,'Bed1' ,'Surface1' ,'Thickness1' ,'MaskIceLevelset1' ,...
         'IceVolume1' ,'IceVolumeAboveFloatation1' ,'TotalSmb1' ,'TotalGroundedBmb1' ,'TotalFloatingBmb1' ,...
+        'Vx2' ,'Vy2' ,'Vel2' ,'Pressure2' ,'Bed2' ,'Surface2' ,'Thickness2' ,'MaskIceLevelset2' ,...
         'IceVolume2' ,'IceVolumeAboveFloatation2' ,'TotalSmb2' ,'TotalGroundedBmb2' ,'TotalFloatingBmb2' ,...
-        'Vx2' ,'Vy2' ,'Vel2' ,'Pressure2' ,'Bed2' ,'Surface2' ,'Thickness2' ,'MaskIceLevelset2' ,...
         'Vx10','Vy10','Vel10','Pressure10','Bed10','Surface10','Thickness10','MaskIceLevelset10',...
         'IceVolume10' ,'IceVolumeAboveFloatation10' ,'TotalSmb10' ,'TotalGroundedBmb10' ,'TotalFloatingBmb10' ,...
@@ -35 +35 @@
 field_tolerances={...
         1e-11,2e-11,2e-11,1e-12,2e-11,6e-12,9e-12,1e-12,...
-        1e-11,2e-11,2e-11,1e-12,2e-11,6e-12,9e-12,1e-12,...
+        1e-11,2e-11,2e-11,1e-12,2e-11,...
         2e-11,1e-11,1e-11,9e-12,2e-1,2e-11,2e-11,1e-11,...
-        1e-11,2e-11,2e-11,1e-12,2e-11,6e-12,9e-12,1e-12,...
+        1e-11,2e-11,2e-11,1e-12,2e-11,...
         2e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-9,...
-        1e-11,2e-11,2e-11,1e-12,2e-11,6e-12,9e-12,1e-12,...
+        1e-11,2e-11,2e-11,1e-12,2e-11,...
         };
 field_values={...

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

@@ -42 +42 @@
                'IceVolume10', 'IceVolumeAboveFloatation10', 'TotalSmb10', 'TotalGroundedBmb10', 'TotalFloatingBmb10']
 field_tolerances = [1e-11, 2e-11, 2e-11, 1e-12, 2e-11, 6e-12, 9e-12, 1e-12,
-                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
+                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13,
                     2e-11, 1e-11, 1e-11, 9e-12, 2e-1, 2e-11, 2e-11, 1e-11,
-                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
+                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13,
                     2e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-9,
-                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13]
+                    1e-12, 2e-12, 2e-12, 1e-13, 1e-13]
 field_values = [md.results.TransientSolution[0].Vx,
                 md.results.TransientSolution[0].Vy,