CHG: relaxing tolerances

ISSMteam · Oct 3, 2024 · 298cb7b · 298cb7b
1 parent 45900e6
commit 298cb7b
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 29 deletions.
diff --git a/test/NightlyRun/test362.m b/test/NightlyRun/test362.m
@@ -4,7 +4,6 @@
 md=triangle(model(),'../Exp/Square.exp',50000.);
 md.mesh.x = md.mesh.x/100;
 md.mesh.y = md.mesh.y/100;
-md.miscellaneous.name='test_hydrology_layer_SSA';
 
 %miscellaneous
 md=setmask(md,'',''); %everywhere grounded
@@ -72,53 +71,53 @@
 md.hydrology.spcphi(pos) = md.materials.rho_ice * md.constants.g * md.geometry.thickness(pos);
 
 md.cluster=generic('np',2);
-md=solve(md,'Transient'); %or 'tr'
+md=solve(md,'Transient');
 
 %Fields and tolerances to track changes
 field_names ={...
 	'HydrologySheetThickness1','HydraulicPotential1','ChannelArea1',...
-    	'Vx1','Vy1','Vel1','Pressure1','Thickness1',...
+	'Vx1','Vy1','Vel1','Pressure1','Thickness1',...
 	'HydrologySheetThickness2','HydraulicPotential2','ChannelArea2',...
-    	'Vx2','Vy2','Vel2','Pressure2','Thickness2',...
+	'Vx2','Vy2','Vel2','Pressure2','Thickness2',...
 	'HydrologySheetThickness3','HydraulicPotential3','ChannelArea3',...
-    	'Vx3','Vy3','Vel3','Pressure3','Thickness3',...
+	'Vx3','Vy3','Vel3','Pressure3','Thickness3',...
 	'HydrologySheetThickness4','HydraulicPotential4','ChannelArea4',...
-    	'Vx4','Vy4','Vel4','Pressure4','Thickness4'};
+	'Vx4','Vy4','Vel4','Pressure4','Thickness4'};
 field_tolerances={...
 	1e-13, 1e-11, 3e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,...
 	1e-13, 1e-11, 3e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,...
 	1e-13, 1e-11, 4e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,...
-	1e-13, 1e-11, 3e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13};
+	1e-13, 1e-11, 4e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13};
 field_values={...
 	md.results.TransientSolution(1).HydrologySheetThickness, ...
 	md.results.TransientSolution(1).HydraulicPotential,...
 	md.results.TransientSolution(1).ChannelArea,...
-    	md.results.TransientSolution(1).Vx,...
-    	md.results.TransientSolution(1).Vy,...
-    	md.results.TransientSolution(1).Vel,...
-    	md.results.TransientSolution(1).Pressure,...
-    	md.results.TransientSolution(1).Thickness,...
+	md.results.TransientSolution(1).Vx,...
+	md.results.TransientSolution(1).Vy,...
+	md.results.TransientSolution(1).Vel,...
+	md.results.TransientSolution(1).Pressure,...
+	md.results.TransientSolution(1).Thickness,...
 	md.results.TransientSolution(2).HydrologySheetThickness, ...
 	md.results.TransientSolution(2).HydraulicPotential,...
 	md.results.TransientSolution(2).ChannelArea,...
-    	md.results.TransientSolution(2).Vx,...
-    	md.results.TransientSolution(2).Vy,...
-    	md.results.TransientSolution(2).Vel,...
-   	md.results.TransientSolution(2).Pressure,...
-    	md.results.TransientSolution(2).Thickness,...
+	md.results.TransientSolution(2).Vx,...
+	md.results.TransientSolution(2).Vy,...
+	md.results.TransientSolution(2).Vel,...
+	md.results.TransientSolution(2).Pressure,...
+	md.results.TransientSolution(2).Thickness,...
 	md.results.TransientSolution(3).HydrologySheetThickness, ...
 	md.results.TransientSolution(3).HydraulicPotential,...
 	md.results.TransientSolution(3).ChannelArea,...
-   	md.results.TransientSolution(3).Vx,...
-   	md.results.TransientSolution(3).Vy,...
-   	md.results.TransientSolution(3).Vel,...
-   	md.results.TransientSolution(3).Pressure,...
-   	md.results.TransientSolution(3).Thickness,...
+	md.results.TransientSolution(3).Vx,...
+	md.results.TransientSolution(3).Vy,...
+	md.results.TransientSolution(3).Vel,...
+	md.results.TransientSolution(3).Pressure,...
+	md.results.TransientSolution(3).Thickness,...
 	md.results.TransientSolution(4).HydrologySheetThickness, ...
 	md.results.TransientSolution(4).HydraulicPotential,...
 	md.results.TransientSolution(4).ChannelArea,...
-   	md.results.TransientSolution(4).Vx,...
-   	md.results.TransientSolution(4).Vy,...
-   	md.results.TransientSolution(4).Vel,...
-   	md.results.TransientSolution(4).Pressure,...
-   	md.results.TransientSolution(4).Thickness};
+	md.results.TransientSolution(4).Vx,...
+	md.results.TransientSolution(4).Vy,...
+	md.results.TransientSolution(4).Vel,...
+	md.results.TransientSolution(4).Pressure,...
+	md.results.TransientSolution(4).Thickness};
diff --git a/test/NightlyRun/test362.py b/test/NightlyRun/test362.py
@@ -80,7 +80,7 @@
 md.hydrology.spcphi[pos] = md.materials.rho_ice * md.constants.g * md.geometry.thickness[pos]
 
 md.cluster = generic('np', 2)
-md = solve(md, 'Transient') # Or 'tr'
+md = solve(md, 'Transient')
 
 # Fields and tolerances to track changes
 field_names = ['HydrologySheetThickness1', 'HydraulicPotential1', 'ChannelArea1','Vx1','Vy1','Vel1','Pressure1','Thickness1',
@@ -90,7 +90,7 @@
 field_tolerances = [1e-13, 1e-11, 3e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
 		    1e-13, 1e-11, 3e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
 		    1e-13, 1e-11, 4e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
-		    1e-13, 1e-11, 3e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13]
+		    1e-13, 1e-11, 4e-12, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13]
 field_values = [md.results.TransientSolution[0].HydrologySheetThickness,
                 md.results.TransientSolution[0].HydraulicPotential,
                 md.results.TransientSolution[0].ChannelArea,