Changeset 14190

Timestamp:

12/18/12 11:19:22 (12 years ago)

Author:

helsen

Message:

changed python scripts for SmbGradients NightlyRuns tests

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test328.py (modified) (1 diff)
• test329.py (modified) (2 diffs)

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

@@ -15 +15 @@
 md=setflowequation(md,'macayeal','all')
 md.surfaceforcings.issmbgradients=1
-md.surfaceforcings.smb_pos_max=5000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y
-md.surfaceforcings.smb_pos_min=1250. + 0.00005*md.mesh.x -0.0001*md.mesh.y
-md.surfaceforcings.a_pos=15000. - 0.000051*md.mesh.x + 0.00011*md.mesh.y
 md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y
-md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y
 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y
-md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)/(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos)
 md.transient.requested_outputs=TotalSmbEnum()
 md.surfaceforcings.href=copy.deepcopy(md.geometry.surface).reshape(-1)
-smbref=numpy.empty_like(md.surfaceforcings.hc)
-for i in xrange(numpy.size(md.surfaceforcings.hc,axis=0)):
-        if md.geometry.surface[i]<md.surfaceforcings.hc[i]:
-                smbref[i]=md.surfaceforcings.a_neg[i]+md.surfaceforcings.b_neg[i]*md.geometry.surface[i]
-        else:
-                smbref[i]=md.surfaceforcings.a_pos[i]+md.surfaceforcings.b_pos[i]*md.geometry.surface[i]
-md.surfaceforcings.smbref=smbref
+md.surfaceforcings.smbref= 1000 - 0.001*md.mesh.x - 0.005*md.mesh.y;
 md.cluster=generic('name',oshostname(),'np',3)
 md=solve(md,TransientSolutionEnum())

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

@@ -16 +16 @@
 md=setflowequation(md,'pattyn','all')
 md.surfaceforcings.issmbgradients=1
-md.surfaceforcings.smb_pos_max=5000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y
-md.surfaceforcings.smb_pos_min=1250. + 0.00005*md.mesh.x -0.0001*md.mesh.y
-md.surfaceforcings.a_pos=15000. - 0.000051*md.mesh.x + 0.00011*md.mesh.y
 md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y
-md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y
 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y
-md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)/(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos)
 md.surfaceforcings.href=copy.deepcopy(md.geometry.surface).reshape(-1)
-smbref=numpy.empty_like(md.surfaceforcings.hc)
-for i in xrange(numpy.size(md.surfaceforcings.hc,axis=0)):
-        if md.geometry.surface[i]<md.surfaceforcings.hc[i]:
-                smbref[i]=md.surfaceforcings.a_neg[i]+md.surfaceforcings.b_neg[i]*md.geometry.surface[i]
-        else:
-                smbref[i]=md.surfaceforcings.a_pos[i]+md.surfaceforcings.b_pos[i]*md.geometry.surface[i]
-md.surfaceforcings.smbref=smbref
+md.surfaceforcings.smbref= 1000 - 0.001*md.mesh.x - 0.005*md.mesh.y;
 md.transient.requested_outputs=TotalSmbEnum()
 md.cluster=generic('name',oshostname(),'np',3)
@@ -36 +25 @@
 
 #Fields and tolerances to track changes
-field_names     =['Vx1','Vy1','Vz1','Vel1','Bed1','Surface1','Thickness1','Temperature1','SMB1','TotalSmb1','Vx2','Vy2','Vz2','Vel2','Bed2','Surface2','Thickness2','Temperature2','SMB2','TotalSmb1','Vx3','Vy3','Vz3','Vel3','Bed3','Surface3','Thickness3','Temperature3','SMB3','TotalSmb1']
+field_names     =['Vx1','Vy1','Vz1','Vel1','Bed1','Surface1','Thickness1','Temperature1','SMB1','TotalSmb1','Vx2','Vy2','Vz2','Vel2','Bed2','Surface2','Thickness2','Temperature2','SMB2','TotalSmb2','Vx3','Vy3','Vz3','Vel3','Bed3','Surface3','Thickness3','Temperature3','SMB3','TotalSmb3']
 field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\
         1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\