Changeset 25157

Timestamp:

06/25/20 09:27:18 (5 years ago)

Author:

jdquinn

Message:

CHG: Minor cleanup.

Location:

issm/trunk-jpl/src/m

Files:

• classes/giaivins.py (modified) (1 diff)
• classes/giamme.py (modified) (1 diff)
• classes/lovenumbers.py (modified) (7 diffs)
• classes/mesh3dsurface.py (modified) (1 diff)
• classes/rotational.py (modified) (1 diff)
• classes/solidearth.py (modified) (1 diff)
• classes/solidearthsettings.py (modified) (1 diff)
• classes/surfaceload.py (modified) (1 diff)
• miscellaneous/fielddisplay.py (modified) (6 diffs)

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

@@ -44 +44 @@
 
     def checkconsistency(self, md, solution, analyses): #{{{
-        if not 'GiaAnalysis' in analyses:
+        if 'GiaAnalysis' not in analyses:
             return md
 

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

@@ -42 +42 @@
 
     def checkconsistency(self, md, solution, analyses): # {{{
-        if not 'SealevelriseAnalysis' in analyses or solution == 'TransientSolution' and md.transient.istidallove == 0:
+        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and md.transient.istidallove == 0):
             return md
 

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

@@ -1 +1 @@
 import numpy as np
+
 from checkfield import checkfield
 from fielddisplay import fielddisplay
@@ -9 +10 @@
     LOVENUMBERS numbers class definition
 
-    Usage:
-      lovenumbers = lovenumbers() #will setup love numbers deg 1001 by default
-      lovenumbers = lovenumbers('maxdeg', 10001);  #supply numbers of degrees required (here, 10001)
+        Usage:
+            lovenumbers = lovenumbers() #will setup love numbers deg 1001 by default
+            lovenumbers = lovenumbers('maxdeg', 10001);  #supply numbers of degrees required (here, 10001)
     '''
 
     def __init__(self, *args):  #{{{
-
         #regular love numbers:
         self.h = []  #provided by PREM model
@@ -26 +26 @@
         self.tl = []
         self.tk2secular = 0  #deg 2 secular number.
-    # }}}
+    #}}}
 
-    def setdefaultparameters(self, maxdeg, referenceframe):  # {{{
-
+    def setdefaultparameters(self, maxdeg, referenceframe): #{{{
         #initialize love numbers:
         self.h = getlovenumbers('type', 'loadingverticaldisplacement', 'referenceframe', referenceframe, 'maxdeg', maxdeg)
@@ -40 +39 @@
         #secular fluid love number:
         self.tk2secular = 0.942
-    # }}}
+    #}}}
 
-    def checkconsistency(self, md, solution, analyses):  # {{{
-
-        if 'SealevelriseAnalysis' not in analyses or (solution == 'TransientSolution' and md.transient.isslr == 0):
+    def checkconsistency(self, md, solution, analyses): #{{{
+        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and md.transient.isslr == 0):
             return
 
@@ -58 +56 @@
         if (size(self.h, 0) != size(self.k, 0) | size(self.h, 0) != size(self.l, 0)):
             raise ValueError('lovenumbers error message: love numbers should be provided at the same level of accuracy')
-    # }}}
+    #}}}
 
-    def defaultoutputs(self, md):  # {{{
+    def defaultoutputs(self, md): #{{{
         return[]
-    # }}}
+    #}}}
 
-    def __repr__(self):  # {{{
+    def __repr__(self): #{{{
         s = '   lovenumbers parameters:'
 
@@ -73 +71 @@
         s += '{}\n'.format(fielddisplay(self, 'tk', 'tidal load Love number (deg 2)'))
         s += '{}\n'.format(fielddisplay(self, 'tk2secular', 'secular fluid Love number'))
-    # }}}
+    #}}}
 
-    def marshall(self, prefix, md, fid):  # {{{
-
+    def marshall(self, prefix, md, fid): #{{{
         WriteData(fid, prefix, 'object', self, 'fieldname', 'h', 'name', 'md.solidearth.lovenumbers.h', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'k', 'name', 'md.solidearth.lovenumbers.k', 'format', 'DoubleMat', 'mattype', 1)
@@ -85 +82 @@
         WriteData(fid, prefix, 'object', self, 'fieldname', 'tl', 'name', 'md.solidearth.lovenumbers.tl', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'data', self.tk2secular, 'fieldname', 'lovenumbers.tk2secular', 'format', 'Double')
-    # }}}
+    #}}}
 
-    def extrude(self, md):  # {{{
+    def extrude(self, md): #{{{
         return
-# }}}
+#}}}

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

@@ -114 +114 @@
         md = checkfield(md, 'fieldname', 'mesh.average_vertex_connectivity', '>=', 9, 'message', '"mesh.average_vertex_connectivity" should be at least 9 in 2d')
 
-        if (solution == 'ThermalSolution'):
+        if solution == 'ThermalSolution':
             md = md.checkmessage('thermal not supported for 2d mesh')
 

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

@@ -48 +48 @@
 
     def checkconsistency(self, md, solution, analyses): # {{{
-        if not 'SealevelriseAnalysis' in analyses or solution == 'TransientSolution' and md.transient.isrotational == 0:
+        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and md.transient.isrotational == 0):
             return md
 

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

@@ -57 +57 @@
 
     def checkconsistency(self, md, solution, analyses):  # {{{
-        if 'SealevelriseAnalysis' not in analyses or (solution == 'TransientSolution' and md.transient.isslr == 0):
+        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and md.transient.isslr == 0):
             return md
 

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

@@ -66 +66 @@
 
     def checkconsistency(self, md, solution, analyses): # {{{
-        if not 'SealevelriseAnalysis' in analyses or solution == 'TransientSolution' and md.transient.issolidearthsettings == 0:
+        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and md.transient.issolidearthsettings == 0):
             return md
 

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

@@ -41 +41 @@
 
     def checkconsistency(self, md, solution, analyses): # {{{
-        if not 'SealevelriseAnalysis' in analyses or solution == 'TransientSolution' and md.transient.issurfaceload == 0:
+        if ('SealevelriseAnalysis' not in analyses) or (solution == 'TransientSolution' and md.transient.issurfaceload == 0):
             return md
 

issm/trunk-jpl/src/m/miscellaneous/fielddisplay.py

@@ -1 +1 @@
 import numpy as np
+
 import MatlabFuncs as m
 
 
 def fielddisplay(md, name, comment):
-    """
+    '''
     FIELDDISPLAY - display model field
 
        Usage:
           fielddisplay(md, name, comment)
-    """
+    '''
 
     #get field
@@ -18 +19 @@
 
 
-def parsedisplay(offset, name, field, comment):  # {{{
-
+def parsedisplay(offset, name, field, comment): #{{{
     #string
     if isinstance(field, str):
@@ -59 +59 @@
 
     return string
-    # }}}
+    #}}}
 
 
-def dict_display(offset, name, field, comment):  # {{{
-
+def dict_display(offset, name, field, comment): #{{{
     if field:
         string = displayunit(offset, name, '{dictionary}', comment) + '\n'
@@ -78 +77 @@
 
     return string
-    # }}}
+    #}}}
 
 
-def list_display(offset, name, field, comment):  # {{{
-
+def list_display(offset, name, field, comment): #{{{
     #initialization
     if isinstance(field, list):
@@ -110 +108 @@
     #call displayunit
     return displayunit(offset, name, string, comment)
-    # }}}
+    #}}}
 
 
-def displayunit(offset, name, characterization, comment):  # {{{
-
+def displayunit(offset, name, characterization, comment): #{{{
     #take care of name
     if len(name) > 23:
@@ -140 +137 @@
 
     return string
-    # }}}
+    #}}}