Changeset 24213 for issm/trunk-jpl/src/m/classes/calvingdev.py

Timestamp:

10/11/19 00:25:20 (5 years ago)

Author:

bdef

Message:

CHG: syntax cahnge to meet most of Pep8 requirement

File:

• issm/trunk-jpl/src/m/classes/calvingdev.py (modified) (1 diff)

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

@@ -4 +4 @@
 from WriteData import WriteData
 
+
 class calvingdev(object):
-        """
-        CALVINGDEV class definition
+    """
+    CALVINGDEV class definition
 
-           Usage:
-              calvingdev=calvingdev();
-        """
+       Usage:
+          calvingdev = calvingdev()
+    """
 
-        def __init__(self): # {{{
+    def __init__(self):  # {{{
 
-                self.stress_threshold_groundedice = 0.
-                self.stress_threshold_floatingice = 0.
-                self.meltingrate   = float('NaN')
+        self.stress_threshold_groundedice = 0.
+        self.stress_threshold_floatingice = 0.
+        self.meltingrate = float('NaN')
 
-                #set defaults
-                self.setdefaultparameters()
+    #set defaults
+        self.setdefaultparameters()
 
-        #}}}
-        def __repr__(self): # {{{
-                string='   Calving Pi parameters:'
-                string="%s\n%s"%(string,fielddisplay(self,'stress_threshold_groundedice','sigma_max applied to grounded ice only [Pa]'))
-                string="%s\n%s"%(string,fielddisplay(self,'stress_threshold_floatingice','sigma_max applied to floating ice only [Pa]'))
+    #}}}
 
-                string="%s\n%s"%(string,fielddisplay(self,'meltingrate','melting rate at given location [m/a]'))
-                return string
-        #}}}
-        def extrude(self,md): # {{{
-                self.meltingrate=project3d(md,'vector',self.meltingrate,'type','node')
-                return self
-        #}}}
-        def setdefaultparameters(self): # {{{
-                #Default sigma max
-                self.stress_threshold_groundedice = 1e6
-                self.stress_threshold_floatingice = 150e3
-                return self
-        #}}}
-        def checkconsistency(self,md,solution,analyses):    # {{{
-                #Early return
-                if solution == 'TransientSolution' or md.transient.ismovingfront == 0:
-                        return
+    def __repr__(self):  # {{{
+        string = '   Calving Pi parameters:'
+        string = "%s\n%s" % (string, fielddisplay(self, 'stress_threshold_groundedice', 'sigma_max applied to grounded ice only [Pa]'))
+        string = "%s\n%s" % (string, fielddisplay(self, 'stress_threshold_floatingice', 'sigma_max applied to floating ice only [Pa]'))
 
-                md = checkfield(md,'fieldname','calving.stress_threshold_groundedice','>',0,'nan',1,'Inf',1)
-                md = checkfield(md,'fieldname','calving.stress_threshold_floatingice','>',0,'nan',1,'Inf',1)
-                md = checkfield(md,'fieldname','calving.meltingrate','NaN',1,'Inf',1,'timeseries',1,'>=',0)
+        string = "%s\n%s" % (string, fielddisplay(self, 'meltingrate', 'melting rate at given location [m / a]'))
+        return string
+    #}}}
 
-                return md
-        # }}}
-        def marshall(self,prefix,md,fid):    # {{{
-                yts=md.constants.yts
+    def extrude(self, md):  # {{{
+        self.meltingrate = project3d(md, 'vector', self.meltingrate, 'type', 'node')
+        return self
+    #}}}
 
-                WriteData(fid,prefix,'name','md.calving.law','data',2,'format','Integer')
-                WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_groundedice','format','DoubleMat','mattype',1)
-                WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_floatingice','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):  # {{{
+        #Default sigma max
+        self.stress_threshold_groundedice = 1e6
+        self.stress_threshold_floatingice = 150e3
+        return self
+    #}}}
+
+    def checkconsistency(self, md, solution, analyses):  # {{{
+        #Early return
+        if solution == 'TransientSolution' or md.transient.ismovingfront == 0:
+            return
+
+        md = checkfield(md, 'fieldname', 'calving.stress_threshold_groundedice', '>', 0, 'nan', 1, 'Inf', 1)
+        md = checkfield(md, 'fieldname', 'calving.stress_threshold_floatingice', '>', 0, 'nan', 1, 'Inf', 1)
+        md = checkfield(md, 'fieldname', 'calving.meltingrate', 'NaN', 1, 'Inf', 1, 'timeseries', 1, '>=', 0)
+
+        return md
+    # }}}
+
+    def marshall(self, prefix, md, fid):  # {{{
+        yts = md.constants.yts
+
+        WriteData(fid, prefix, 'name', 'md.calving.law', 'data', 2, 'format', 'Integer')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'stress_threshold_groundedice', 'format', 'DoubleMat', 'mattype', 1)
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'stress_threshold_floatingice', 'format', 'DoubleMat', 'mattype', 1)
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'meltingrate', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts, 'scale', 1. / yts)
+    # }}}