Changeset 13466


Ignore:
Timestamp:
09/27/12 10:51:08 (12 years ago)
Author:
jschierm
Message:

CHG: Update for multiple columns.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/test/Par/SquareShelf.py

    r13465 r13466  
    1515ymax=max(md.mesh.y)
    1616
    17 md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)
     17md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y.reshape(-1,1)-ymin)/(ymax-ymin)
    1818md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness
    1919md.geometry.surface=md.geometry.bed+md.geometry.thickness
     
    3939[md.initialization.vx]=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
    4040[md.initialization.vy]=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
    41 md.initialization.vz=zeros(md.mesh.numberofvertices)
    42 md.initialization.pressure=zeros(md.mesh.numberofvertices)
     41md.initialization.vz=zeros((md.mesh.numberofvertices,1))
     42md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
    4343
    4444#dbg - begin
     
    5555
    5656#Materials
    57 md.initialization.temperature = (273.-20.)*ones(md.mesh.numberofvertices)
     57md.initialization.temperature = (273.-20.)*ones((md.mesh.numberofvertices,1))
    5858md.materials.rheology_B = paterson(md.initialization.temperature)
    59 md.materials.rheology_n = 3.*ones(md.mesh.numberofelements)
     59md.materials.rheology_n = 3.*ones((md.mesh.numberofelements,1))
    6060
    6161#Friction
    6262pos=nonzero(md.mask.elementonfloatingice)
    63 md.friction.coefficient = 20.*ones(md.mesh.numberofvertices)
     63md.friction.coefficient = 20.*ones((md.mesh.numberofvertices,1))
    6464md.friction.coefficient[md.mesh.elements[pos,:].astype(int)-1] = 0.
    65 md.friction.p = ones(md.mesh.numberofelements)
    66 md.friction.q = ones(md.mesh.numberofelements)
     65md.friction.p = ones((md.mesh.numberofelements,1))
     66md.friction.q = ones((md.mesh.numberofelements,1))
    6767
    6868#Numerical parameters
Note: See TracChangeset for help on using the changeset viewer.