Changeset 24795

Timestamp:

05/05/20 06:29:57 (5 years ago)

Author:

bdef

Message:

CHG:syntax and matlab equality

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test243.py (modified) (1 diff)
• test318.py (modified) (1 diff)
• test900.py (modified) (1 diff)

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

@@ -60 +60 @@
 md = solve(md, 'Transient')
 
-nlayers=np.size(md.results.TransientSolution[0].SmbT,1)
-for i in range(1, np.size(md.results.TransientSolution,0)):
-    nlayers=np.minimum(np.size(md.results.TransientSolution[i].SmbT,1),nlayers)
+nlayers = np.size(md.results.TransientSolution[0].SmbT, 1)
+for i in range(1, np.size(md.results.TransientSolution, 0)):
+    nlayers = np.minimum(np.size(md.results.TransientSolution[i].SmbT, 1), nlayers)
 
 #Fields and tolerances to track changes
-field_names = ['Layers','SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbA', 'SmbEC', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC', 'SmbMeanSHF', 'SmbMeanLHF', 'SmbMeanULW', 'SmbNetLW', 'SmbNetSW']
-field_tolerances = [1e-12,2e-12,1e-12,1e-11,1e-11,2e-11,1e-11,1e-12,1e-11,1e-12,1e-12,1e-12,1e-11,2e-11,2e-11,1e-11,9e-10,2e-11] 
+field_names = ['Layers', 'SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbA', 'SmbEC', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC', 'SmbMeanSHF', 'SmbMeanLHF', 'SmbMeanULW', 'SmbNetLW', 'SmbNetSW']
+field_tolerances = [1e-12, 2e-12, 1e-12, 1e-11, 1e-11, 2e-11, 1e-11, 1e-12, 1e-11, 1e-12, 1e-12, 1e-12, 1e-11, 2e-11, 2e-11, 1e-11, 9e-10, 2e-11]
 #shape is different in python solution (fixed using reshape) which can cause test failure:
-field_values = [nlayers,md.results.TransientSolution[-1].SmbDz[0, 0:nlayers].reshape(1, -1),
+field_values = [nlayers,
+                md.results.TransientSolution[-1].SmbDz[0, 0:nlayers].reshape(1, -1),
                 md.results.TransientSolution[-1].SmbT[0, 0:nlayers].reshape(1, -1),
                 md.results.TransientSolution[-1].SmbD[0, 0:nlayers].reshape(1, -1),

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

@@ -20 +20 @@
 #Fields and tolerances to track changes
 field_names = ['Vx', 'Vy', 'Vz', 'Vel', 'Pressure', 'Temperature', 'BasalforcingsGroundediceMeltingRate']
-field_tolerances = [1e-13, 1e-13, 2.6e-10, 1e-10, 1e-13, 1e-11, 1e-6]
+field_tolerances = [1e-13, 1e-13, 6e-10, 1e-10, 1e-13, 1e-11, 1e-6]
 field_values = [md.results.SteadystateSolution.Vx,
                 md.results.SteadystateSolution.Vy,

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

@@ -1 @@
-#Test Name:SquareNoDynUnConfinedHydroDC
+#Test Name: SquareNoDynUnConfinedHydroDC
 import numpy as np
 from model import *