Changeset 18792

Timestamp:

11/17/14 10:44:24 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed test806, still some ERRORs

Location:

issm/trunk-jpl

Files:

• src/m/classes/calvinglevermann.py (modified) (1 diff)
• test/NightlyRun/test806.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/calvinglevermann.py

@@ -34 +34 @@
 
                 #Early return
-                if (solution!=TransientSolutionEnum()) or (not md.transient.iscalvinglevermann):
+                if (solution!=TransientSolutionEnum()) or (not md.transient.iscalving):
                         return md
 

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

@@ -8 +8 @@
 from solve import *
 from MatlabFuncs import *
-from numpy import *
+import numpy
 
 md=triangle(model(),'../Exp/Square.exp',50000.)
@@ -40 +40 @@
 md.calving.coeff=4.89e13*numpy.ones((md.mesh.numberofvertices,1));
 
-md.transient.requested_outputs={'default','StrainRateparallel','StrainRateperpendicular','Calvingratex','Calvingratey','CalvingCalvingrate'}
+md.transient.requested_outputs=['default','StrainRateparallel','StrainRateperpendicular','Calvingratex','Calvingratey','CalvingCalvingrate']
 
 md=solve(md,TransientSolutionEnum())