Changeset 24213 for issm/trunk-jpl/src/m/classes/giaivins.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/giaivins.py (modified) (1 diff)

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

@@ -4 +4 @@
 from WriteData import WriteData
 
+
 class giaivins(object):
-        """
-        GIA class definition
+    """
+    GIA class definition
 
-           Usage:
-              giaivins=giaivins();
-        """
+       Usage:
+          giaivins = giaivins()
+    """
 
-        def __init__(self): # {{{
-                self.mantle_viscosity              = float('NaN');
-                self.lithosphere_thickness         = float('NaN');
-                self.cross_section_shape           = 0;
-        
-                #set defaults
-                self.setdefaultparameters()
+    def __init__(self):  # {{{
+        self.mantle_viscosity = float('NaN')
+        self.lithosphere_thickness = float('NaN')
+        self.cross_section_shape = 0
 
-                #}}}
-        def __repr__(self): # {{{
-                
-                string='   giaivins solution parameters:' 
-                
-                string="%s\n%s"%(string,fielddisplay(self,'mantle_viscosity','mantle viscosity constraints (NaN means no constraint) (Pa s)'))
-                string="%s\n%s"%(string,fielddisplay(self,'lithosphere_thickness','lithosphere thickness constraints (NaN means no constraint) (m)'))
-                string="%s\n%s"%(string,fielddisplay(self,'cross_section_shape',"1: square-edged, 2: elliptical-edged surface"))
-                return string
-                #}}}
-        def extrude(self,md): # {{{
-                self.mantle_viscosity=project3d(md,'vector',self.mantle_viscosity,'type','node')
-                self.lithosphere_thickness=project3d(md,'vector',self.lithosphere_thickness,'type','node')
-                return self
-        #}}}
-        def setdefaultparameters(self): # {{{
+    #set defaults
+        self.setdefaultparameters()
 
-                self.cross_section_shape=1; 
+    #}}}
 
-                return self
-        #}}}
-        def checkconsistency(self,md,solution,analyses):    # {{{
+    def __repr__(self):  # {{{
+        string = '   giaivins solution parameters:'
 
-                # Early return 
-                if ('GiaAnalysis' not in  analyses):
-                        return md 
-                
-                md = checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0)
-                md = checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0)
-                md = checkfield(md,'fieldname','gia.cross_section_shape','numel',[1],'values',[1,2])
+        string = "%s\n%s" % (string, fielddisplay(self, 'mantle_viscosity', 'mantle viscosity constraints (NaN means no constraint) (Pa s)'))
+        string = "%s\n%s" % (string, fielddisplay(self, 'lithosphere_thickness', 'lithosphere thickness constraints (NaN means no constraint) (m)'))
+        string = "%s\n%s" % (string, fielddisplay(self, 'cross_section_shape', "1: square-edged, 2: elliptical - edged surface"))
+        return string
+    #}}}
 
-                #be sure that if we are running a masstransport ice flow model coupled with giaivins, that thickness forcings 
-                #are not provided into the future.
+    def extrude(self, md):  # {{{
+        self.mantle_viscosity = project3d(md, 'vector', self.mantle_viscosity, 'type', 'node')
+        self.lithosphere_thickness = project3d(md, 'vector', self.lithosphere_thickness, 'type', 'node')
+        return self
+    #}}}
 
-                return md
-        # }}}
-        def marshall(self,prefix,md,fid):    # {{{
+    def setdefaultparameters(self):  # {{{
+        self.cross_section_shape = 1
+        return self
+    #}}}
 
-                WriteData(fid,prefix,'object',self,'fieldname','mantle_viscosity','format','DoubleMat','mattype',1);
-                WriteData(fid,prefix,'object',self,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1,'scale',10.**3.);
-                WriteData(fid,prefix,'object',self,'fieldname','cross_section_shape','format','Integer');
-        # }}}
+    def checkconsistency(self, md, solution, analyses):  # {{{
+        # Early return
+        if ('GiaAnalysis' not in analyses):
+            return md
+
+        md = checkfield(md, 'fieldname', 'gia.mantle_viscosity', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices], '>', 0)
+        md = checkfield(md, 'fieldname', 'gia.lithosphere_thickness', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofvertices], '>', 0)
+        md = checkfield(md, 'fieldname', 'gia.cross_section_shape', 'numel', [1], 'values', [1, 2])
+
+        #be sure that if we are running a masstransport ice flow model coupled with giaivins, that thickness forcings
+        #are not provided into the future.
+
+        return md
+    # }}}
+
+    def marshall(self, prefix, md, fid):  # {{{
+
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'mantle_viscosity', 'format', 'DoubleMat', 'mattype', 1)
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'lithosphere_thickness', 'format', 'DoubleMat', 'mattype', 1, 'scale', 10.**3.)
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'cross_section_shape', 'format', 'Integer')
+    # }}}