Changeset 17437

Timestamp:

03/14/14 14:33:58 (11 years ago)

Author:

jbondzio

Message:

CHG: enabled masstransport; checking fields Thickness and Surface

Location:

issm/trunk-jpl/test

Files:

• Archives/Archive336.nc (modified) ( previous)
• NightlyRun/test336.py (modified) (4 diffs)

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

@@ -12 +12 @@
 md=parameterize(md,'../Par/SquareSheetConstrained.py') 
 md=setflowequation(md,'SSA','all')
-md.cluster=generic('name',oshostname(),'np',1)
-# md.cluster=generic('name',oshostname(),'np',3)
+md.cluster=generic('name',oshostname(),'np',3)
 
 # parameters
 md.transient.isstressbalance=True
-md.transient.ismasstransport=False
+md.transient.ismasstransport=True
 md.transient.isthermal=False
 md.transient.isgroundingline=False
@@ -28 +27 @@
 xmed, ymed=(xmax+xmin)/2.,(ymax+ymin)/2.  
 
-# distx=numpy.absolute(md.mesh.x.reshape(-1,1)-xmed)
-# disty=numpy.absolute(md.mesh.y.reshape(-1,1)-ymed)
-# md.mask.ice_levelset=numpy.maximum(distx,disty)-0.2*(xmax-xmin)
-
-D=numpy.sqrt(numpy.power(md.mesh.x.reshape(-1,1)-xmed,2.)+numpy.power(md.mesh.y.reshape(-1,1)-ymed,2.))
-R=0.2*(xmax-xmin)
-md.mask.ice_levelset=D-R
-md.masstransport.calvingrate=0.*numpy.ones((md.mesh.numberofvertices,1))
+md.mask.ice_levelset=md.mesh.y.reshape(-1,1) - ymed
 
 md=solve(md,TransientSolutionEnum())
 
 #Fields and tolerances to track changes
-field_names     =['Vx','Vy','Vel','Pressure','MaskIceLevelset']
-field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
+field_names     =['Vx','Vy','Vel','Pressure','Thickness','Surface','MaskIceLevelset']
+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_values=[\
         md.results.TransientSolution[0].Vx,\
@@ -47 +41 @@
         md.results.TransientSolution[0].Vel,\
         md.results.TransientSolution[0].Pressure,\
+        md.results.TransientSolution[0].Thickness,\
+        md.results.TransientSolution[0].Surface,\
         md.results.TransientSolution[0].MaskIceLevelset,\
         md.results.TransientSolution[1].Vx,\
@@ -52 +48 @@
         md.results.TransientSolution[1].Vel,\
         md.results.TransientSolution[1].Pressure,\
+        md.results.TransientSolution[1].Thickness,\
+        md.results.TransientSolution[1].Surface,\
         md.results.TransientSolution[1].MaskIceLevelset,\
+        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].Surface,\
+        md.results.TransientSolution[2].MaskIceLevelset,\
         ]