Changeset 27035 for issm/trunk/test/NightlyRun/test249.py

Timestamp:

06/01/22 05:01:48 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27033

Location:

issm/trunk

Files:

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

issm/trunk/test/NightlyRun/test249.py

@@ -1 @@
-#Test Name: SquareShelfTranMLHO2d
+#Test Name: SquareShelfTranMOLHO2d
 
 from model import *
 from socket import gethostname
-from triangle import *
-from setmask import *
-from parameterize import *
-from setflowequation import *
-from solve import *
+from triangle import triangle
+from setmask import setmask
+from parameterize import parameterize
+from setflowequation import setflowequation
+from solve import solve
 from generic import generic
+from SetMOLHOBC import SetMOLHOBC
 
 md = triangle(model(), '../Exp/Square.exp', 150000)
@@ -14 +15 @@
 md = parameterize(md, '../Par/SquareShelf.py')
 md.basalforcings.floatingice_melting_rate[:] = 1.
-md = setflowequation(md, 'MLHO', 'all')
+md = setflowequation(md, 'MOLHO', 'all')
 md.cluster = generic('name', gethostname(), 'np', 3)
 md.transient.requested_outputs = ['default', 'FloatingArea', 'GroundedArea', 'TotalFloatingBmb', 'TotalGroundedBmb']
-md = SetMLHOBC(md);
+md = SetMOLHOBC(md)
 md = solve(md, 'Transient')