Index: ../trunk-jpl/test/NightlyRun/test806.py
===================================================================
--- ../trunk-jpl/test/NightlyRun/test806.py	(revision 18791)
+++ ../trunk-jpl/test/NightlyRun/test806.py	(revision 18792)
@@ -7,7 +7,7 @@
 from EnumDefinitions import *
 from solve import *
 from MatlabFuncs import *
-from numpy import *
+import numpy
 
 md=triangle(model(),'../Exp/Square.exp',50000.)
 md=setmask(md,'','')
@@ -39,7 +39,7 @@
 md.calving=calvinglevermann();
 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())
 
Index: ../trunk-jpl/src/m/classes/calvinglevermann.py
===================================================================
--- ../trunk-jpl/src/m/classes/calvinglevermann.py	(revision 18791)
+++ ../trunk-jpl/src/m/classes/calvinglevermann.py	(revision 18792)
@@ -33,7 +33,7 @@
 	def checkconsistency(self,md,solution,analyses):    # {{{
 
 		#Early return
-		if (solution!=TransientSolutionEnum()) or (not md.transient.iscalvinglevermann):
+		if (solution!=TransientSolutionEnum()) or (not md.transient.iscalving):
 			return md
 
 		md = checkfield(md,'fieldname','calving.coeff','size',[md.mesh.numberofvertices],'>',0)
