Changeset 16560 for issm/trunk/test/Par/SquareShelfConstrained.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/SquareShelfConstrained.py (modified) (3 diffs)

issm/trunk/test/Par/SquareShelfConstrained.py

@@ -3 +3 @@
 import numpy
 import inspect
-from verbose import *
+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
@@ -40 +40 @@
 md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1))
 
+#Damage
+md.damage.D=numpy.zeros((md.mesh.numberofvertices,1))
+
 #Surface mass balance and basal melting
 md.surfaceforcings.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1))
@@ -69 +72 @@
 if len(inspect.stack()) > 2:
         md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0]
-