Changeset 24313 for issm/trunk/src/m/classes/calvinglevermann.py

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/calvinglevermann.py (modified) (1 diff)

issm/trunk/src/m/classes/calvinglevermann.py

@@ -2 +2 @@
 from checkfield import checkfield
 from WriteData import WriteData
+from project3d import project3d
+
 
 class calvinglevermann(object):
-        """
-        CALVINGLEVERMANN class definition
+    """
+    CALVINGLEVERMANN class definition
 
-           Usage:
-              calvinglevermann=calvinglevermann();
-        """
+       Usage:
+          calvinglevermann = calvinglevermann()
+    """
 
-        def __init__(self): # {{{
+    def __init__(self):  # {{{
 
-                self.coeff         = float('NaN')
-                self.meltingrate   = float('NaN')
+        self.coeff = float('NaN')
 
-                #set defaults
-                self.setdefaultparameters()
+    #set defaults
+        self.setdefaultparameters()
 
-                #}}}
-        def __repr__(self): # {{{
-                string='   Calving Levermann parameters:'
-                string="%s\n%s"%(string,fielddisplay(self,'coeff','proportionality coefficient in Levermann model'))
-                string="%s\n%s"%(string,fielddisplay(self,'meltingrate','melting rate at given location [m/a]'))
+    #}}}
 
-                return string
-                #}}}
-        def extrude(self,md): # {{{
-                self.coeff=project3d(md,'vector',self.coeff,'type','node')
-                self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node')
-                return self
-        #}}}
-        def setdefaultparameters(self): # {{{
+    def __repr__(self):  # {{{
+        string = '   Calving Levermann parameters:'
+        string = "%s\n%s" % (string, fielddisplay(self, 'coeff', 'proportionality coefficient in Levermann model'))
 
-                #Proportionality coefficient in Levermann model
-                self.coeff=2e13;
-        #}}}
-        def checkconsistency(self,md,solution,analyses):    # {{{
+        return string
+    #}}}
 
-                #Early return
-                if (solution!='TransientSolution') or (not md.transient.ismovingfront):
-                        return md
+    def extrude(self, md):  # {{{
+        self.coeff = project3d(md, 'vector', self.coeff, 'type', 'node')
+        return self
+    #}}}
 
-                md = checkfield(md,'fieldname','calving.coeff','size',[md.mesh.numberofvertices],'>',0)
-                md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>=',0)
-                return md
-        # }}}
-        def marshall(self,prefix,md,fid):    # {{{
-                yts=md.constants.yts
-                WriteData(fid,prefix,'name','md.calving.law','data',3,'format','Integer');
-                WriteData(fid,prefix,'object',self,'fieldname','coeff','format','DoubleMat','mattype',1)
-                WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts)
-        # }}}
+    def setdefaultparameters(self):  # {{{
+        #Proportionality coefficient in Levermann model
+        self.coeff = 2e13
+    #}}}
+
+    def checkconsistency(self, md, solution, analyses):  # {{{
+        #Early return
+        if (solution != 'TransientSolution') or (not md.transient.ismovingfront):
+            return md
+
+        md = checkfield(md, 'fieldname', 'calving.coeff', 'size', [md.mesh.numberofvertices], '>', 0)
+        return md
+    # }}}
+
+    def marshall(self, prefix, md, fid):  # {{{
+        WriteData(fid, prefix, 'name', 'md.calving.law', 'data', 3, 'format', 'Integer')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'coeff', 'format', 'DoubleMat', 'mattype', 1)
+    # }}}