Index: ../trunk-jpl/src/m/classes/masstransport.py
===================================================================
--- ../trunk-jpl/src/m/classes/masstransport.py	(revision 18755)
+++ ../trunk-jpl/src/m/classes/masstransport.py	(revision 18756)
@@ -14,9 +14,6 @@
 
 	def __init__(self): # {{{
 		self.spcthickness           = float('NaN')
-		self.iscalvingrate          = 0
-		self.calvingrate            = float('NaN')
-		self.levermann_calving_coeff= 0.
 		self.isfreesurface          = 0
 		self.min_thickness          = 0.
 		self.hydrostatic_adjustment = 0
@@ -32,9 +29,6 @@
 	def __repr__(self): # {{{
 		string='   Masstransport solution parameters:'
 		string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint) [m]'))
-		string="%s\n%s"%(string,fielddisplay(self,'iscalvingrate','do we use calving (loss of ice)'))
-		string="%s\n%s"%(string,fielddisplay(self,'calvingrate','calving rate at given location [m/a]'))
-		string="%s\n%s"%(string,fielddisplay(self,'levermann_calving_coeff','Proportionality coefficient in Levermann model'))
 		string="%s\n%s"%(string,fielddisplay(self,'isfreesurface','do we use free surfaces (FS only) are mass conservation'))
 		string="%s\n%s"%(string,fielddisplay(self,'min_thickness','minimum ice thickness allowed [m]'))
 		string="%s\n%s"%(string,fielddisplay(self,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' '))
@@ -50,9 +44,6 @@
 	#}}}
 	def setdefaultparameters(self): # {{{
 
-		#Proportionality coefficient in Levermann model                                 |
-		self.levermann_calving_coeff=2.e13
-		
 		#Type of stabilization to use 0:nothing 1:artificial_diffusivity 3:Discontinuous Galerkin
 		self.stabilization=1
 
@@ -76,10 +67,6 @@
 			return md
 
 		md = checkfield(md,'fieldname','masstransport.spcthickness','forcing',1)
-		if LevelsetAnalysisEnum() in analyses and md.transient.islevelset:
-			md = checkfield(md,'fieldname','masstransport.calvingrate','NaN',1,'size',[md.mesh.numberofvertices],'>=',0)
-			md = checkfield(md,'fieldname','masstransport.iscalvingrate','values',[0,1])
-			md = checkfield(md,'fieldname','masstransport.levermann_calving_coeff','>',0)
 		md = checkfield(md,'fieldname','masstransport.isfreesurface','values',[0,1])
 		md = checkfield(md,'fieldname','masstransport.hydrostatic_adjustment','values',['Absolute','Incremental'])
 		md = checkfield(md,'fieldname','masstransport.stabilization','values',[0,1,2,3,4])
@@ -93,9 +80,6 @@
 		yts=365.*24.*3600.
 
 		WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
-		WriteData(fid,'object',self,'fieldname','calvingrate','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1,'scale',1./yts)
-		WriteData(fid,'object',self,'fieldname','iscalvingrate','format','Boolean')
-		WriteData(fid,'object',self,'fieldname','levermann_calving_coeff','format','Double')
 		WriteData(fid,'object',self,'fieldname','isfreesurface','format','Boolean')
 		WriteData(fid,'object',self,'fieldname','min_thickness','format','Double')
 		WriteData(fid,'data',StringToEnum(self.hydrostatic_adjustment)[0],'format','Integer','enum',MasstransportHydrostaticAdjustmentEnum())
