Changeset 18756

Timestamp:

11/07/14 15:36:38 (10 years ago)

Author:

srebuffi

Message:

CHG: added calving class

File:

• issm/trunk-jpl/src/m/classes/masstransport.py (modified) (5 diffs)

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

@@ -15 +15 @@
         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.
@@ -33 +30 @@
                 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]'))
@@ -51 +45 @@
         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
@@ -77 +68 @@
 
                 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'])
@@ -94 +81 @@
 
                 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')