Changeset 16137 for issm/trunk/test/Par/SquareShelf.py

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• test (modified) (1 prop)
• test/Par/SquareShelf.py (modified) (2 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/test/Par/SquareShelf.py

@@ -14 +14 @@
 ymin=min(md.mesh.y)
 ymax=max(md.mesh.y)
-
-md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)
+xmin=min(md.mesh.x)
+xmax=max(md.mesh.x)
+md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)+0.1*(hmin-hmax)*(md.mesh.x.reshape(-1,1)-xmin)/(xmax-xmin)
 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
 md.geometry.surface=md.geometry.bed+md.geometry.thickness
@@ -59 +60 @@
 
 #Friction
-pos=nonzero(md.mask.elementonfloatingice)
 md.friction.coefficient = 20.*ones((md.mesh.numberofvertices,1))
-md.friction.coefficient[md.mesh.elements[pos,:].astype(int)-1] = 0.
+md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
 md.friction.p = ones((md.mesh.numberofelements,1))
 md.friction.q = ones((md.mesh.numberofelements,1))
 
 #Numerical parameters
-md.diagnostic.viscosity_overshoot = 0.3
-md.prognostic.stabilization = 1.
+md.stressbalance.viscosity_overshoot = 0.3
+md.masstransport.stabilization = 1.
 md.thermal.stabilization = 1.
 md.settings.waitonlock = 30
 md.verbose=verbose()
-md.diagnostic.restol = 0.10
+md.stressbalance.restol = 0.10
 md.steadystate.reltol = 0.02
-md.diagnostic.reltol = 0.02
-md.diagnostic.abstol = nan
+md.stressbalance.reltol = 0.02
+md.stressbalance.abstol = nan
 md.timestepping.time_step = 1.
 md.timestepping.final_time = 3.

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad