Changeset 20243

Timestamp:

02/25/16 09:15:09 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing Mac tests on jenkins

Location:

issm/trunk-jpl

Files:

• jenkins/macosx_pine-island (modified) (1 diff)
• test/NightlyRun/test237.m (modified) (1 diff)
• test/NightlyRun/test237.py (modified) (1 diff)
• test/NightlyRun/test350.m (modified) (1 diff)

issm/trunk-jpl/jenkins/macosx_pine-island

@@ -80 +80 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-##                                                                   bamg mesh   FS                     
+##                           bamg mesh   FS                     
 PYTHON_NROPTIONS=""
-MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,435,IdFromString('Dakota')]"
+MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,703,435,IdFromString('Dakota')]"

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

@@ -69 +69 @@
 field_tolerances={...
         1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,1e-13,1e-13,...
-        1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,1e-13,1e-13,...
-        1e-13,1e-13,1e-08,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,1e-13,1e-13};
+        1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-7,1e-13,1e-13,...
+        1e-13,1e-13,1e-08,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-7,1e-13,1e-13};
 field_values={...
         (md.results.TransientSolution(1).Vx),...

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

@@ -81 +81 @@
                 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','SmbMonthlytemperatures3','SmbMassBalance3'];
 field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,1e-13,1e-13,\
-                1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,7e-13,7e-8,1e-13,1e-13,\
-                1e-13,1e-13,1e-08,1e-13,1e-13,1e-8,1e-8,1e-8,7e-13,7e-8,1e-13,1e-13];
+                1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,7e-13,1e-7,1e-13,1e-13,\
+                1e-13,1e-13,1e-08,1e-13,1e-13,1e-8,1e-8,1e-8,7e-13,1e-7,1e-13,1e-13];
 field_values=[\
         md.results.TransientSolution[0].Vx,\

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

@@ -65 +65 @@
         1e-13, 1e-13, 1e-13,...
         1e-13, 1e-13, 1e-13,...
-        1e-13, 1e-13, 1e-13};
+        1e-13, 1e-13, 1e-12};
 field_values={...
         md.results.TransientSolution(1).HydrologyHead, ...