Changeset 21729 for issm/trunk/test/NightlyRun/test119.py

Timestamp:

05/19/17 14:48:02 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21727

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test119.py (modified) (2 diffs)

issm/trunk/test/NightlyRun/test119.py

@@ -1 +1 @@
 #Test Name: SquareBamgMesh
-import numpy
+import numpy as np
 import time
 from model import *
+from socket import gethostname
 from bamg import *
-from MatlabFuncs import *
+
 
 #Simple mesh
@@ -12 +13 @@
 
 #hVertices
-md=bamg(model(),'domain','../Exp/Square.exp','hmax',300000.,'hVertices',numpy.array([10000.,100000.,400000.,100000.]).reshape(-1,1),'rand',False)
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',300000.,'hVertices',np.array([10000.,100000.,400000.,100000.]).reshape(-1,1),'rand',False)
 x2=md.mesh.x
 y2=md.mesh.y