Changeset 25485

Timestamp:

08/27/20 05:12:12 (5 years ago)

Author:

bdef

Message:

CHG:minor syntax

Location:

issm/trunk-jpl/src/m

Files:

• classes/solidearth.py (modified) (1 diff)
• consistency/ismodelselfconsistent.py (modified) (2 diffs)
• qmu/helpers.py (modified) (11 diffs)

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

@@ -1 +1 @@
 import numpy as np
-
 from checkfield import checkfield
 from fielddisplay import fielddisplay

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py

@@ -1 @@
-def ismodelselfconsistent(md): #{{{
+def ismodelselfconsistent(md):  #{{{
     '''
     ISMODELSELFCONSISTENT - check that model forms a closed form solvable problem.
@@ -36 +36 @@
 #}}}
 
-def AnalysisConfiguration(solutiontype): #{{{
+
+def AnalysisConfiguration(solutiontype):  #{{{
     '''
     ANALYSISCONFIGURATION - return type of analyses, number of analyses

issm/trunk-jpl/src/m/qmu/helpers.py

@@ -1 +1 @@
 from collections import OrderedDict
-from copy import deepcopy
-
 import numpy as np
 
@@ -12 +10 @@
 class Lstruct(list):
     """
-    An empty struct that can be assigned arbitrary attributes but can also be 
+    An empty struct that can be assigned arbitrary attributes but can also be
     accesed as a list. Eg. x.y = 'hello', x[:] = ['w', 'o', 'r', 'l', 'd']
 
-    Note that 'x' returns the array and x.__dict__ will only return attributes 
+    Note that 'x' returns the array and x.__dict__ will only return attributes
     other than the array
 
-    List-based and struct-based behaviors work normally, however they are 
-    referenced as if the other does not exist; len(x) corresponds only to the 
-    list component of x, len(x.a) corresponds to x.a, x.__dict__ corresponds 
+    List-based and struct-based behaviors work normally, however they are
+    referenced as if the other does not exist; len(x) corresponds only to the
+    list component of x, len(x.a) corresponds to x.a, x.__dict__ corresponds
     only to the non-x-list attributes
 
@@ -65 +63 @@
 class OrderedStruct(object):
     """
-    A form of dictionary-like structure that maintains the ordering in which 
+    A form of dictionary-like structure that maintains the ordering in which
     its fields/attributes and their corresponding values were added.
 
-    OrderedDict is a similar device, however this class can be used as an 
+    OrderedDict is a similar device, however this class can be used as an
     "ordered struct/class" giving it much more flexibility in practice. It is
     also easier to work with fixed valued keys in-code.
@@ -91 +89 @@
         x = OrderedStruct('y', 5, 'z', 6)
 
-    note below that the output fields as iterables are always in the same 
+    note below that the output fields as iterables are always in the same
     order as the inputs
 
@@ -111 +109 @@
     ('y', 6)
 
-    Note: to access internal fields use dir(x) (input fields will be included, 
+    Note: to access internal fields use dir(x) (input fields will be included,
     but are not technically internals)
     """
@@ -117 +115 @@
     def __init__(self, *args):
         """
-        Provided either nothing or a series of strings, construct a structure 
-        that will, when accessed as a list, return its fields in the same order 
+        Provided either nothing or a series of strings, construct a structure
+        that will, when accessed as a list, return its fields in the same order
         in which they were provided
         """
@@ -233 +231 @@
 def isempty(x):
     """
-    returns true if object is +/-infinity, NaN, None, '', has length 0, or is 
-    an array/matrix composed only of such components (includes mixtures of 
+    returns true if object is +/-infinity, NaN, None, '', has length 0, or is
+    an array/matrix composed only of such components (includes mixtures of
     "empty" types)
     """
@@ -272 +270 @@
     """
     returns a list of fields of x
-    ignore_internals ignores all fieldnames starting with '_' and is True by 
+    ignore_internals ignores all fieldnames starting with '_' and is True by
     default
     """
@@ -286 +284 @@
     """
     is y is a field of x?
-    ignore_internals ignores all fieldnames starting with '_' and is True by 
+    ignore_internals ignores all fieldnames starting with '_' and is True by
     default
     """
@@ -338 +336 @@
 
     Note: will include any newlines or tabs that occur in that line,
-    use str(findline(f, s)).strip() to remove these, str() in case result is 
+    use str(findline(f, s)).strip() to remove these, str() in case result is
     None
     """
@@ -354 +352 @@
     filler is 0.0 by default
 
-    as_numpy_ndarray will return the result as a numpy.ndarray and is False by 
+    as_numpy_ndarray will return the result as a numpy.ndarray and is False by
     default
 
-    Note: the filler must be either None/np.nan/float('NaN'), float/double, or 
+    Note: the filler must be either None/np.nan/float('NaN'), float/double, or
     int. other numpy and float values such as +/- np.inf will also work