Changeset 16171 for issm/trunk-jpl/test/Par/SquareShelf2.py

Timestamp:

09/18/13 13:49:15 (12 years ago)

Author:

cborstad

Message:

BUG: missed some numpy handles for function calls

File:

• issm/trunk-jpl/test/Par/SquareShelf2.py (modified) (4 diffs)

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

@@ -23 +23 @@
 iVelF = netCDF4.Dataset('../Data/SquareShelf.nc','r')
 
-x=reshape(iVelF.variables['x'][:],(-1))
-y=reshape(iVelF.variables['y'][:],(-1))
+x=numpy.reshape(iVelF.variables['x'][:],(-1))
+y=numpy.reshape(iVelF.variables['y'][:],(-1))
 vx=iVelF.variables['vx'][:]
 vy=iVelF.variables['vy'][:]
@@ -55 +55 @@
 
 #Materials
-md.initialization.temperature = (273.-20.)*ones((md.mesh.numberofvertices,1))
+md.initialization.temperature = (273.-20.)*numpy.ones((md.mesh.numberofvertices,1))
 md.materials.rheology_B = paterson(md.initialization.temperature)
-md.materials.rheology_n = 3.*ones((md.mesh.numberofelements,1))
+md.materials.rheology_n = 3.*numpy.ones((md.mesh.numberofelements,1))
 
 #Damage
@@ -63 +63 @@
 
 #Friction
-md.friction.coefficient = 20.*ones((md.mesh.numberofvertices,1))
+md.friction.coefficient = 20.*numpy.ones((md.mesh.numberofvertices,1))
 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))
+md.friction.p = numpy.ones((md.mesh.numberofelements,1))
+md.friction.q = numpy.ones((md.mesh.numberofelements,1))
 
 #Numerical parameters
@@ -77 +77 @@
 md.steadystate.reltol = 0.02
 md.stressbalance.reltol = 0.02
-md.stressbalance.abstol = nan
+md.stressbalance.abstol = float('nan')
 md.timestepping.time_step = 1.
 md.timestepping.final_time = 3.