Changeset 21341 for issm/trunk/test/NightlyRun/test604.py

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

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

issm/trunk/test/NightlyRun/test604.py

@@ -2 +2 @@
 import numpy
 from model import *
-from EnumDefinitions import *
 from MatlabFuncs import *
 from triangle import *
@@ -15 +14 @@
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',oshostname(),'np',3)
-md=solve(md,SurfaceSlopeSolutionEnum())
+md=solve(md,'SurfaceSlope')
 
 #Fields and tolerances to track changes