Changeset 25503

Timestamp:

08/31/20 19:43:53 (5 years ago)

Author:

jdquinn

Message:

BUG: Corrected frictionwaterlayer failure (constructor works more like MATLAB now)

Location:

issm/trunk-jpl

Files:

• src/m/classes/frictionwaterlayer.py (modified) (3 diffs)
• test/NightlyRun/test439.py (modified) (1 diff)

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

@@ -4 +4 @@
 from fielddisplay import fielddisplay
 from project3d import project3d
+from structtoobj import structtoobj
 from WriteData import WriteData
 
@@ -14 +15 @@
     """
 
-    def __init__(self, md):  # {{{
+    def __init__(self, *args):  # {{{
         self.coefficient = np.nan
         self.f = np.nan
@@ -20 +21 @@
         self.q = np.nan
         self.water_layer = np.nan
+
+        nargs = len(args)
+        if nargs == 0:
+            self.setdefaultparameters()
+        elif nargs == 1:
+            self = structtoobj(self, args[0])
     #}}}
 

issm/trunk-jpl/test/NightlyRun/test439.py

@@ -15 +15 @@
 md = md.extrude(4, 1.)
 md = setflowequation(md, 'HO', 'all')
-md.friction = frictionwaterlayer(md)
+md.friction = frictionwaterlayer(md.friction)
 md.friction.water_layer = np.zeros((md.mesh.numberofvertices + 1, 2))
 md.friction.water_layer[:, 1] = 1.