Index: ../trunk-jpl/src/m/classes/calving.py
===================================================================
--- ../trunk-jpl/src/m/classes/calving.py	(revision 18765)
+++ ../trunk-jpl/src/m/classes/calving.py	(revision 18766)
@@ -25,11 +25,6 @@
 
 		return string
 		#}}}
-	def defaultoutputs(self,md): # {{{
-
-		return []
-
-	#}}}
 	def setdefaultparameters(self): # {{{
 
 		return self
Index: ../trunk-jpl/src/m/classes/calvinglevermann.py
===================================================================
--- ../trunk-jpl/src/m/classes/calvinglevermann.py	(revision 0)
+++ ../trunk-jpl/src/m/classes/calvinglevermann.py	(revision 18766)
@@ -0,0 +1,45 @@
+from fielddisplay import fielddisplay
+from EnumDefinitions import *
+from StringToEnum import StringToEnum
+from checkfield import checkfield
+from WriteData import WriteData
+
+class calvinglevermann(object):
+	"""
+	CALVINGLEVERMANN class definition
+
+	   Usage:
+	      calvinglevermann=calvinglevermann();
+	"""
+
+	def __init__(self): # {{{
+		self.coeff = float('NaN')
+
+		#set defaults
+		self.setdefaultparameters()
+
+		#}}}
+	def __repr__(self): # {{{
+		string='   Calving Levermann parameters:'
+		string="%s\n%s"%(string,fielddisplay(self,'coeff','proportionality coefficient in Levermann model'))
+
+		return string
+		#}}}
+	def setdefaultparameters(self): # {{{
+
+		#Proportionality coefficient in Levermann model
+		self.coeff=2e13;
+	#}}}
+	def checkconsistency(self,md,solution,analyses):    # {{{
+
+		#Early return
+		if (solution!=TransientSolutionEnum()) or (not md.transient.iscalvinglevermann):
+			return md
+
+		md = checkfield(md,'fieldname','calving.coeff','NaN',1,'size',[md.mesh.numberofvertices],'>',0)
+		return md
+	# }}}
+	def marshall(self,md,fid):    # {{{
+		WriteData(fid,'enum',CalvingLawEnum(),'data',CalvingLevermannEnum(),'format','Integer');
+		WriteData(fid,'enum',CalvinglevermannCoeffEnum(),'data',self.coeff,'format','DoubleMat','mattype',1)
+	# }}}
Index: ../trunk-jpl/src/m/classes/calvinglevermann.m
===================================================================
--- ../trunk-jpl/src/m/classes/calvinglevermann.m	(revision 18765)
+++ ../trunk-jpl/src/m/classes/calvinglevermann.m	(revision 18766)
@@ -5,7 +5,7 @@
 
 classdef calvinglevermann
 	properties (SetAccess=public) 
-		 coeff                  = 0;
+		 coeff = NaN;
 	end
 	methods
 		function obj = calvinglevermann(varargin) % {{{
@@ -36,7 +36,7 @@
 			md = checkfield(md,'fieldname','calving.coeff','>',0,'size',[md.mesh.numberofvertices 1]);
 		end % }}}
 		function disp(obj) % {{{
-			disp(sprintf('   Calving parameters:'));
+			disp(sprintf('   Calving Levermann parameters:'));
 			fielddisplay(obj,'coeff','proportionality coefficient in Levermann model');
 
 		end % }}}
Index: ../trunk-jpl/src/m/classes/model.py
===================================================================
--- ../trunk-jpl/src/m/classes/model.py	(revision 18765)
+++ ../trunk-jpl/src/m/classes/model.py	(revision 18766)
@@ -15,6 +15,7 @@
 from basalforcings import basalforcings
 from matice import matice
 from calving import calving
+from calvinglevermann import calvinglevermann
 from damage import damage
 from friction import friction
 from flowequation import flowequation
@@ -663,9 +664,9 @@
 		md.stressbalance.loadingforce=project3d(md,'vector',md.stressbalance.loadingforce,'type','node')
 
 		# Calving variables
-		if hasattr(md.calving,'calving'):
+		if isinstance(md.calving,calving):
 			md.calving.calvingrate=project3d(md,'vector',md.calving.calvingrate,'type','node')
-		if hasattr(md.calving,'calvinglevermann'):
+		if isinstance(md.calving,calvinglevermann):
 			md.calving.coeff=project3d(md,'vector',md.calving.coeff,'type','node')
 
 		# Hydrologydc variables
