Index: ../trunk-jpl/test/NightlyRun/test806.py
===================================================================
--- ../trunk-jpl/test/NightlyRun/test806.py	(revision 0)
+++ ../trunk-jpl/test/NightlyRun/test806.py	(revision 18782)
@@ -0,0 +1,84 @@
+from model import *
+from triangle import *
+from squaremesh import *
+from setmask import *
+from parameterize import *
+from setflowequation import *
+from EnumDefinitions import *
+from solve import *
+from MatlabFuncs import *
+
+md=triangle(model(),'../Exp/Square.exp',50000.)
+md=setmask(md,'','')
+md=parameterize(md,'../Par/SquareShelf.py')
+md=setflowequation(md,'SSA','all')
+md.cluster=generic('name',oshostname(),'np',3)
+
+x = md.mesh.x
+xmin = min(x)
+xmax = max(x)
+Lx = (xmax-xmin)
+alpha = 2./3.
+md.mask.ice_levelset = ((x - alpha*Lx)>0) - ((x - alpha*Lx)<0)
+
+md.timestepping.time_step=10
+md.timestepping.final_time=30
+
+
+
+#Transient
+md.transient.isstressbalance=True
+md.transient.islevelset=True
+md.transient.ismasstransport=True
+md.transient.isthermal=False
+md.transient.isgroundingline=False
+md.transient.isgia=False
+md.transient.iscalving=True;
+
+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=solve(md,TransientSolutionEnum())
+
+#Fields and tolerances to track changes
+field_names     =['Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','StrainRateparallel1','StrainRateperpendicular1','CalvingCalvingrate1',\
+		'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','StrainRateparallel2','StrainRateperpendicular2','CalvingCalvingrate2',\
+		'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','StrainRateparallel3','StrainRateperpendicular3','CalvingCalvingrate3']
+field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
+		2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
+		2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
+field_values=[\
+	md.results.TransientSolution[0].Vx,\
+	md.results.TransientSolution[0].Vy,\
+	md.results.TransientSolution[0].Vel,\
+	md.results.TransientSolution[0].Pressure,\
+	md.results.TransientSolution[0].Thickness,\
+	md.results.TransientSolution[0].Surface,\
+	md.results.TransientSolution[0].MaskIceLevelset,\
+	md.results.TransientSolution[0].StrainRateparallel,\
+	md.results.TransientSolution[0].StrainRateperpendicular,\
+	md.results.TransientSolution[0].CalvingCalvingrate,\
+	md.results.TransientSolution[1].Vx,\
+	md.results.TransientSolution[1].Vy,\
+	md.results.TransientSolution[1].Vel,\
+	md.results.TransientSolution[1].Pressure,\
+	md.results.TransientSolution[1].Thickness,\
+	md.results.TransientSolution[1].Surface,\
+	md.results.TransientSolution[1].MaskIceLevelset,\
+	md.results.TransientSolution[1].StrainRateparallel,\
+	md.results.TransientSolution[1].StrainRateperpendicular,\
+	md.results.TransientSolution[1].CalvingCalvingrate,\
+	md.results.TransientSolution[2].Vx,\
+	md.results.TransientSolution[2].Vy,\
+	md.results.TransientSolution[2].Vel,\
+	md.results.TransientSolution[2].Pressure,\
+	md.results.TransientSolution[2].Thickness,\
+	md.results.TransientSolution[2].Surface,\
+	md.results.TransientSolution[2].MaskIceLevelset,\
+	md.results.TransientSolution[2].StrainRateparallel,\
+	md.results.TransientSolution[2].StrainRateperpendicular,\
+	md.results.TransientSolution[2].CalvingCalvingrate,\
+
+	]
Index: ../trunk-jpl/test/NightlyRun/test806.m
===================================================================
--- ../trunk-jpl/test/NightlyRun/test806.m	(revision 0)
+++ ../trunk-jpl/test/NightlyRun/test806.m	(revision 18782)
@@ -0,0 +1,71 @@
+md=triangle(model(),'../Exp/Square.exp',50000.);
+md=setmask(md,'all','');
+md=parameterize(md,'../Par/SquareShelf.par');
+md=setflowequation(md,'SSA','all');
+md.cluster=generic('name',oshostname(),'np',3);
+
+x = md.mesh.x;
+xmin = min(x);
+xmax = max(x);
+Lx = (xmax-xmin);
+alpha = 2./3.;
+md.mask.ice_levelset = ((x - alpha*Lx)>0) - ((x - alpha*Lx)<0);
+
+md.timestepping.time_step=10;
+md.timestepping.final_time=30;
+
+%Transient
+md.transient.isstressbalance=1;
+md.transient.islevelset=1;
+md.transient.ismasstransport=1;
+md.transient.isthermal=0;
+md.transient.isgroundingline=0;
+md.transient.isgia=0;
+md.transient.iscalving=1;
+
+md.calving=calvinglevermann();
+md.calving.coeff=4.89e13*ones(md.mesh.numberofvertices,1);
+
+md.transient.requested_outputs={'default','StrainRateparallel','StrainRateperpendicular','Calvingratex','Calvingratey','CalvingCalvingrate'};
+
+md=solve(md,TransientSolutionEnum());
+
+%Fields and tolerances to track changes
+field_names     ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','StrainRateparallel1','StrainRateperpendicular1','CalvingCalvingrate1'...
+		'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','StrainRateparallel2','StrainRateperpendicular2','CalvingCalvingrate2'...
+		'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','StrainRateparallel3','StrainRateperpendicular3','CalvingCalvingrate3'};
+field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
+		2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
+		2e-13,2e-13,2e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
+field_values={...
+	md.results.TransientSolution(1).Vx,...
+	md.results.TransientSolution(1).Vy,...
+	md.results.TransientSolution(1).Vel,...
+	md.results.TransientSolution(1).Pressure,...
+	md.results.TransientSolution(1).Thickness,...
+	md.results.TransientSolution(1).Surface,...
+	md.results.TransientSolution(1).MaskIceLevelset,...
+	md.results.TransientSolution(1).StrainRateparallel,...
+	md.results.TransientSolution(1).StrainRateperpendicular,...
+	md.results.TransientSolution(1).CalvingCalvingrate,...
+	md.results.TransientSolution(2).Vx,...
+	md.results.TransientSolution(2).Vy,...
+	md.results.TransientSolution(2).Vel,...
+	md.results.TransientSolution(2).Pressure,...
+	md.results.TransientSolution(2).Thickness,...
+	md.results.TransientSolution(2).Surface,...
+	md.results.TransientSolution(2).MaskIceLevelset,...
+	md.results.TransientSolution(2).StrainRateparallel,...
+	md.results.TransientSolution(2).StrainRateperpendicular,...
+	md.results.TransientSolution(2).CalvingCalvingrate,...
+	md.results.TransientSolution(3).Vx,...
+	md.results.TransientSolution(3).Vy,...
+	md.results.TransientSolution(3).Vel,...
+	md.results.TransientSolution(3).Pressure,...
+	md.results.TransientSolution(3).Thickness,...
+	md.results.TransientSolution(3).Surface,...
+	md.results.TransientSolution(3).MaskIceLevelset,...
+	md.results.TransientSolution(3).StrainRateparallel,...
+	md.results.TransientSolution(3).StrainRateperpendicular,...
+	md.results.TransientSolution(3).CalvingCalvingrate,...
+	};
Index: ../trunk-jpl/test/NightlyRun/IdToName.m
===================================================================
--- ../trunk-jpl/test/NightlyRun/IdToName.m	(revision 18781)
+++ ../trunk-jpl/test/NightlyRun/IdToName.m	(revision 18782)
@@ -194,6 +194,7 @@
 	case 803, name='ValleyGlacierLevelsetEnthalpyHO3d';
 	case 804, name='ValleyGlacierLevelsetCalvingSIA2d';
 	case 805, name='ValleyGlacierLevelsetEnthCalvingHO3d';
+	case 806, name='SquareShelfLevelsetCalvingSIA2dLevermann';
 	case 1101, name='ISMIPAHO';
 	case 1102, name='ISMIPAFS';
 	case 1103, name='ISMIPBHO';
Index: ../trunk-jpl/test/NightlyRun/IdToName.py
===================================================================
--- ../trunk-jpl/test/NightlyRun/IdToName.py	(revision 18781)
+++ ../trunk-jpl/test/NightlyRun/IdToName.py	(revision 18782)
@@ -179,6 +179,7 @@
 	803  : 'ValleyGlacierLevelsetEnthalpyHO3d',	
 	804  : 'ValleyGlacierLevelsetCalvingSIA2d',	
 	805  : 'ValleyGlacierLevelsetEnthCalvingHO3d',	
+	806  : 'SquareShelfLevelsetCalvingSIA2dLevermann',	
 	1101 : 'ISMIPAHO',
 	1102 : 'ISMIPAFS',
 	1103 : 'ISMIPBHO',
Index: ../trunk-jpl/src/m/classes/calvinglevermann.py
===================================================================
--- ../trunk-jpl/src/m/classes/calvinglevermann.py	(revision 18781)
+++ ../trunk-jpl/src/m/classes/calvinglevermann.py	(revision 18782)
@@ -36,7 +36,7 @@
 		if (solution!=TransientSolutionEnum()) or (not md.transient.iscalvinglevermann):
 			return md
 
-		md = checkfield(md,'fieldname','calving.coeff','NaN',1,'size',[md.mesh.numberofvertices],'>',0)
+		md = checkfield(md,'fieldname','calving.coeff','size',[md.mesh.numberofvertices],'>',0)
 		return md
 	# }}}
 	def marshall(self,md,fid):    # {{{
