Changeset 26744 for issm/trunk/src/m/classes/calvingvonmises.py

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/calvingvonmises.py (modified) (4 diffs)

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

@@ +1 @@
+from checkfield import checkfield
 from fielddisplay import fielddisplay
-from checkfield import checkfield
 from WriteData import WriteData
 
 
 class calvingvonmises(object):
-    """
-    CALVINGVONMISES class definition
+    """CALVINGVONMISES class definition
 
-       Usage:
-          calvingvonmises = calvingvonmises()
+    Usage:
+        calvingvonmises = calvingvonmises()
     """
 
     def __init__(self):  # {{{
-
-        self.stress_threshold_groundedice = 0.
-        self.stress_threshold_floatingice = 0.
-        self.min_thickness = 0.
+        self.stress_threshold_groundedice = 0
+        self.stress_threshold_floatingice = 0
+        self.min_thickness = 0
 
     #set defaults
@@ -24 +22 @@
 
     def __repr__(self):  # {{{
-        string = '   Calving VonMises 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, 'min_thickness', 'minimum thickness below which no ice is allowed [m]'))
-
-        return string
+        s = '   Calving VonMises parameters:\n'
+        s += '{}\n'.format(fielddisplay(self, 'stress_threshold_groundedice', 'sigma_max applied to grounded ice only [Pa]'))
+        s += '{}\n'.format(fielddisplay(self, 'stress_threshold_floatingice', 'sigma_max applied to floating ice only [Pa]'))
+        s += '{}\n'.format(fielddisplay(self, 'min_thickness', 'minimum thickness below which no ice is allowed [m]'))
+        return s
     #}}}
 
@@ -37 +34 @@
 
     def setdefaultparameters(self):  # {{{
-        #Default sigma max
+        # Default sigma max
         self.stress_threshold_groundedice = 1e6
         self.stress_threshold_floatingice = 150e3
 
-        #turn off min_thickness by default.
+        # Turn off min_thickness by default
         self.min_thickness = 0.
         return self
@@ -47 +44 @@
 
     def checkconsistency(self, md, solution, analyses):  # {{{
-        #Early return
-        if solution == 'TransientSolution' or md.transient.ismovingfront == 0:
+        # Early return
+        if solution == 'TransientSolution' or not md.transient.ismovingfront:
             return