Changeset 17462

Timestamp:

03/18/14 14:01:03 (11 years ago)

Author:

jbondzio

Message:

CHG: relaxing tolerances, adding slope in y direction for geometry

Location:

issm/trunk-jpl/test

Files:

• Archives/Archive801.nc (modified) ( previous)
• Archives/Archive802.nc (modified) ( previous)
• Archives/Archive803.nc (modified) ( previous)
• Archives/Archive804.nc (modified) ( previous)
• Archives/Archive805.nc (modified) ( previous)
• NightlyRun/test801.py (modified) (1 diff)
• NightlyRun/test802.py (modified) (1 diff)
• NightlyRun/test805.py (modified) (1 diff)
• Par/ValleyGlacierShelf.py (modified) (1 diff)

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

@@ -31 +31 @@
                 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2',\
                 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3']
-field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
-                1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
-                1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
+field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,\
+                1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,\
+                1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12]
 field_values=[\
         md.results.TransientSolution[0].Vx,\

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

@@ -34 +34 @@
                 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','Temperature2',\
                 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Temperature3']
-field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
+field_tolerances=[1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,\
                 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\
                 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10]

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

@@ -37 +37 @@
                 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','Enthalpy2','Watercolumn2',\
                 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3']
-field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
+field_tolerances=[1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,\
                 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\
                 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10]

issm/trunk-jpl/test/Par/ValleyGlacierShelf.py

@@ -25 +25 @@
 
 alpha=2./3.
-slope = (bmin-bmax)*(x-xmin)/(Lx*alpha) + bmax
+slope = 0.9*(bmin-bmax)*(x-xmin)/(Lx*alpha) + 0.1*(bmin-bmax)*(y-ymin)/(Ly) + bmax
 md.geometry.surface= (thk_center+bmax) + slope 
 md.geometry.bed=bmax + slope + 4./Ly**2*(thk_center-thk_margin)*(numpy.power(y-ym,2))