Changeset 13463

Timestamp:

09/27/12 09:48:29 (12 years ago)

Author:

jschierm

Message:

CHG: Changed all data 1-d vectors to 2-d arrays to allow multiple columns.

Location:

issm/trunk-jpl/test

Files:

• NightlyRun/test121.py (modified) (1 diff)
• NightlyRun/test122.py (modified) (1 diff)
• Par/Pig.py (added)
• Par/SquareShelfConstrained.py (modified) (3 diffs)

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

@@ -14 +14 @@
 md=setflowequation(md,'macayeal','all')
 md.cluster=generic('name',oshostname(),'np',3);
-md.initialization.waterfraction=numpy.zeros(md.mesh.numberofvertices)
+md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,1))
 md.transient.isdiagnostic=0
 md.transient.isprognostic=0

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

@@ -13 +13 @@
 md.extrude(3,1)
 md=setflowequation(md,'pattyn','all')
-md.initialization.waterfraction=numpy.zeros(md.mesh.numberofvertices)
+md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,1))
 md.thermal.isenthalpy=1
 md.thermal.stabilization=2

issm/trunk-jpl/test/Par/SquareShelfConstrained.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
@@ -26 +26 @@
 vx=f.variables['vx'][:]
 vy=f.variables['vy'][:]
-#deal with 'F' oriented matlab matrices!
-index=f.variables['index'][:].astype(float)
-index=reshape(index.T,(len(index),3),order='F')
+index=f.variables['index'][:]
 f.close()
 
 [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))
 #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))
 #Surface mass balance and basal melting
-md.surfaceforcings.mass_balance = 10.*ones(md.mesh.numberofvertices)
-md.basalforcings.melting_rate = 5.*ones(md.mesh.numberofvertices)
+md.surfaceforcings.mass_balance = 10.*ones((md.mesh.numberofvertices,1))
+md.basalforcings.melting_rate = 5.*ones((md.mesh.numberofvertices,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
 md.diagnostic.viscosity_overshoot = 0.0
@@ -57 +55 @@
 md.diagnostic.reltol = 0.05
 md.steadystate.reltol = 0.05
-md.diagnostic.abstol = nan
+md.diagnostic.abstol = float('nan')
 md.timestepping.time_step = 1.
 md.timestepping.final_time = 3.