Changeset 28030 for issm/trunk-jpl/src/m/classes/frictioncoulomb.py

Timestamp:

12/19/23 21:01:48 (15 months ago)

Author:

jdquinn

Message:

CHG: MATLAB -> Python; cleanup

File:

• issm/trunk-jpl/src/m/classes/frictioncoulomb.py (modified) (5 diffs)

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

@@ -7 +7 @@
 
 
-class frictioncoulomb(object):
-    """FRICTIONCOULOMB class definition
+class frictioncoulomb():
+    """frictioncoulomb class definition
 
     Usage:
@@ -14 +14 @@
     """
 
-    def __init__(self):  # {{{
+    def __init__(self, *args):  # {{{
         self.coefficient = np.nan
         self.coefficientcoulomb = np.nan
@@ -23 +23 @@
         self.effective_pressure_limit = 0
 
-        self.setdefaultparameters()
+        nargs = len(args)
+
+        if nargs == 0:
+            self.setdefaultparameters()
+        else:
+            raise Exception('constructor not supported')
     # }}}
 
@@ -77 +82 @@
 
     def marshall(self, prefix, md, fid):  # {{{
+        yts = md.constants.yts
+
         WriteData(fid, prefix, 'name', 'md.friction.law', 'data', 7, 'format', 'Integer')
-        WriteData(fid, prefix, 'object', self, 'fieldname', 'coefficient', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', md.constants.yts)
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'coefficient', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'coefficientcoulomb', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'p', 'format', 'DoubleMat', 'mattype', 2)
@@ -85 +92 @@
         WriteData(fid, prefix, 'object', self, 'class', 'friction', 'fieldname', 'effective_pressure_limit', 'format', 'Double')
         if self.coupling == 1:
-            WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'effective_pressure', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', md.constants.yts)
+            WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'effective_pressure', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts)
         elif self.coupling == 2:
             raise ValueError('not implemented yet')