Changeset 26639

Timestamp:

11/18/21 04:56:13 (3 years ago)

Author:

bdef

Message:

BUG: import and matlab function fix

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test257.py (modified) (1 diff)
• test812.py (modified) (1 diff)

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

@@ -24 +24 @@
 idbasin = np.zeros((md.mesh.numberofelements,))
 iid1 = np.where(md.mesh.y >= 2. / 3. * ymax)[0]
-iid2 = intersect(np.where(md.mesh.y < 2. / 3. * ymax)[0], np.where(md.mesh.x >= 1. / 3. * xmax)[0])
-iid3 = intersect(np.where(md.mesh.y < 2. / 3. * ymax)[0], np.where(md.mesh.x < 1. / 3. * xmax)[0])
+iid2 = np.where(np.logical_and(md.mesh.y < 2. / 3. * ymax, md.mesh.x >= 1. / 3. * xmax))[0]
+iid3 = np.where(np.logical_and(md.mesh.y < 2. / 3. * ymax, md.mesh.x < 1. / 3. * xmax))[0]
 for ii in range(md.mesh.numberofelements):
     for vertex in range(3):

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

@@ -3 +3 @@
 from socket import gethostname
 from model import *
-from parameterize import *
-from setflowequation import *
-from setmask import *
-from solve import *
-from triangle import *
+from parameterize import parameterize
+from setflowequation import setflowequation
+from setmask import setmask
+from solve import solve
+from triangle import triangle
+from SetMLHOBC import SetMLHOBC
 
 md = triangle(model(), '../Exp/Square.exp', 50000.)