Changeset 13466

Timestamp:

09/27/12 10:51:08 (12 years ago)

Author:

jschierm

Message:

CHG: Update for multiple columns.

File:

• issm/trunk-jpl/test/Par/SquareShelf.py (modified) (3 diffs)

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

@@ -15 +15 @@
 ymax=max(md.mesh.y)
 
-md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)
+md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)
 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
 md.geometry.surface=md.geometry.bed+md.geometry.thickness
@@ -39 +39 @@
 [md.initialization.vx]=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
 [md.initialization.vy]=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
-md.initialization.vz=zeros(md.mesh.numberofvertices)
-md.initialization.pressure=zeros(md.mesh.numberofvertices)
+md.initialization.vz=zeros((md.mesh.numberofvertices,1))
+md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
 
 #dbg - begin
@@ -55 +55 @@
 
 #Materials
-md.initialization.temperature = (273.-20.)*ones(md.mesh.numberofvertices)
+md.initialization.temperature = (273.-20.)*ones((md.mesh.numberofvertices,1))
 md.materials.rheology_B = paterson(md.initialization.temperature)
-md.materials.rheology_n = 3.*ones(md.mesh.numberofelements)
+md.materials.rheology_n = 3.*ones((md.mesh.numberofelements,1))
 
 #Friction
 pos=nonzero(md.mask.elementonfloatingice)
-md.friction.coefficient = 20.*ones(md.mesh.numberofvertices)
+md.friction.coefficient = 20.*ones((md.mesh.numberofvertices,1))
 md.friction.coefficient[md.mesh.elements[pos,:].astype(int)-1] = 0.
-md.friction.p = ones(md.mesh.numberofelements)
-md.friction.q = ones(md.mesh.numberofelements)
+md.friction.p = ones((md.mesh.numberofelements,1))
+md.friction.q = ones((md.mesh.numberofelements,1))
 
 #Numerical parameters