Changeset 14590

Timestamp:

04/15/13 16:25:12 (13 years ago)

Author:

Eric.Larour

Message:

CHG: updated test330 python script

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test330.m (modified) (1 diff)
• test330.py (modified) (1 diff)

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

@@ -4 +4 @@
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
 md=setflowequation(md,'macayeal','all');
-md.verbose=verbose('solution',true,'convergence',true,'mprocessor',true,'module',true);
 md.cluster=generic('name',oshostname(),'np',3);
 md=solve(md,GiaSolutionEnum());

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

@@ -15 +15 @@
 md.extrude(3,1)
 md=setflowequation(md,'pattyn','all')
-md.surfaceforcings.issmbgradients=1
-md.surfaceforcings.b_pos=-100. + 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.href=copy.deepcopy(md.geometry.surface).reshape(-1)
-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)
-md=solve(md,TransientSolutionEnum())
+md=solve(md,GiaSolutionEnum())
 
 #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','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,\
-        1e-09,5e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10]
-field_values=[\
-        md.results.TransientSolution[0].Vx,\
-        md.results.TransientSolution[0].Vy,\
-        md.results.TransientSolution[0].Vz,\
-        md.results.TransientSolution[0].Vel,\
-        md.results.TransientSolution[0].Bed,\
-        md.results.TransientSolution[0].Surface,\
-        md.results.TransientSolution[0].Thickness,\
-        md.results.TransientSolution[0].Temperature,\
-        md.results.TransientSolution[0].SurfaceforcingsMassBalance,\
-        md.results.TransientSolution[0].TotalSmb,\
-        md.results.TransientSolution[1].Vx,\
-        md.results.TransientSolution[1].Vy,\
-        md.results.TransientSolution[1].Vz,\
-        md.results.TransientSolution[1].Vel,\
-        md.results.TransientSolution[1].Bed,\
-        md.results.TransientSolution[1].Surface,\
-        md.results.TransientSolution[1].Thickness,\
-        md.results.TransientSolution[1].Temperature,\
-        md.results.TransientSolution[1].SurfaceforcingsMassBalance,\
-        md.results.TransientSolution[1].TotalSmb,\
-        md.results.TransientSolution[2].Vx,\
-        md.results.TransientSolution[2].Vy,\
-        md.results.TransientSolution[2].Vz,\
-        md.results.TransientSolution[2].Vel,\
-        md.results.TransientSolution[2].Bed,\
-        md.results.TransientSolution[2].Surface,\
-        md.results.TransientSolution[2].Thickness,\
-        md.results.TransientSolution[2].Temperature,\
-        md.results.TransientSolution[2].SurfaceforcingsMassBalance,\
-        md.results.TransientSolution[2].TotalSmb,\
-        ]
+field_names     =['GiaW']
+field_tolerances=[1e-13]
+field_values=[md.results.GiaSolution.GiaW]