Changeset 25449

Timestamp:

08/24/20 00:47:13 (5 years ago)

Author:

bdef

Message:

BUG:fix of bad Python translation

File:

• issm/trunk-jpl/src/m/classes/mask.py (modified) (7 diffs)

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

@@ -14 +14 @@
             mask = mask()
     '''
-    def __init__(self): # {{{
+    def __init__(self):  # {{{
         self.ice_levelset = float('NaN')
         self.ocean_levelset = float('NaN')
@@ -21 +21 @@
         self.setdefaultparameters()
     # }}}
-    def __repr__(self): # {{{
+
+    def __repr__(self):  # {{{
         string = "   masks:"
 
@@ -28 +29 @@
         return string
     # }}}
-    def setdefaultparameters(self): # {{{
+
+    def setdefaultparameters(self):  # {{{
         return self
     # }}}
-    def extrude(self, md): # {{{
-        self.ice_levelset   = project3d(md, 'vector', self.ice_levelset, 'type', 'node')
+
+    def extrude(self, md):  # {{{
+        self.ice_levelset = project3d(md, 'vector', self.ice_levelset, 'type', 'node')
         self.ocean_levelset = project3d(md, 'vector', self.ocean_levelset, 'type', 'node')
 
         return self
     # }}}
-    def mask(self, *args): # {{{
-        nargin = len(args)
-        if nargin == 0:
+
+    def mask(self, *args):  # {{{
+        if len(args) == 0:
             self.setdefaultparameters()
         else:
@@ -46 +49 @@
         return self
     # }}}
-    def oceanset(self, *args): # {{{
-        if nargin == 2:
+
+    def oceanset(self, *args):  # {{{
+        if len(args) == 2:
             ocean = args[0]
             index = args[1]
             self.ocean_levelset[index] = -ocean
-        elif nargin == 1:
+        elif len(args) == 1:
             ocean = args[0]
             self.ocean_levelset = -ocean
@@ -59 +63 @@
         return self
     # }}}
-    def iceset(self, *args): # {{{
-        if nargin == 2:
+
+    def iceset(self, *args):  # {{{
+        if len(args) == 2:
             ice = args[0]
             index = args[1]
             self.ice_levelset[index] = -ice
-        elif nargin == 1:
+        elif len(args) == 1:
             ice = args[0]
-            self.ocean_levelset = -ocean
+            self.ocean_levelset = -ice
         else:
             raise RuntimeError("iceset error message: not supported yet")
@@ -72 +77 @@
         return self
     # }}}
-    def checkconsistency(self, md, solution, analyses): # {{{
+
+    def checkconsistency(self, md, solution, analyses):  # {{{
         if solution == 'LoveSolution':
             return
@@ -83 +89 @@
         return md
     # }}}
-    def marshall(self, prefix, md, fid): # {{{
+
+    def marshall(self, prefix, md, fid):  # {{{
         WriteData(fid, prefix, 'object', self, 'fieldname', 'ocean_levelset', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'ice_levelset', 'format', 'DoubleMat', 'mattype', 1)