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

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

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

issm/trunk/test/Par/SquareShelf.py

@@ -2 +2 @@
 import inspect
 import netCDF4
-from numpy import *
-from verbose import *
+import numpy
+from verbose import verbose
 from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
-from paterson import *
-from SetIceShelfBC import *
+from paterson import paterson
+from SetIceShelfBC import SetIceShelfBC
 
 #Start defining model parameters here
@@ -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'][:]
@@ -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,1))
-md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
+md.initialization.vz=numpy.zeros((md.mesh.numberofvertices,1))
+md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,1))
 
 #dbg - begin
@@ -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
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
 
 #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
@@ -74 +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.