Changeset 24896

Timestamp:

05/22/20 17:18:16 (5 years ago)

Author:

jdquinn

Message:

CHG: MATLAB -> Python translations; fixing previous mistakes (again); cleanup.

Location:

issm/trunk-jpl/src/m/classes

Files:

• mask.m (modified) (5 diffs)
• mask.py (modified) (3 diffs)
• mesh3dsurface.py (modified) (2 diffs)

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

@@ -21 +21 @@
                         %2020 May 15th
                         if isstruct(self)
-            selfnew = mask();
-            if isfield(self,'ice_levelset')
-               selfnew.ice_levelset = self.ice_levelset;
-            end
-            if isfield(self,'ocean_levelset')
-               selfnew.ocean_levelset = self.ocean_levelset;
-            end
-            if isfield(self,'groundedice_levelset')
-               disp('WARNING: automatically updated md.mask as groundedice_levelset is now ocean_levelset');
-               selfnew.ocean_levelset = self.groundedice_levelset;
-            end
-            self = selfnew;
+                                selfnew = mask();
+                                if isfield(self,'ice_levelset')
+                                        selfnew.ice_levelset = self.ice_levelset;
+                                end
+                                if isfield(self,'ocean_levelset')
+                                        selfnew.ocean_levelset = self.ocean_levelset;
+                                end
+                                if isfield(self,'groundedice_levelset')
+                                        disp('WARNING: automatically updated md.mask as groundedice_levelset is now ocean_levelset');
+                                        selfnew.ocean_levelset = self.groundedice_levelset;
+                                end
+                                self = selfnew;
                         end
-
-                end% }}}
+                end % }}}
         end
         methods
+                function disp(self) % {{{
+                        disp(sprintf('   masks:'));
+
+                        fielddisplay(self,'ocean_levelset','presence of ocean if < 0, coastline/grounding line if = 0, no ocean if > 0');
+                        fielddisplay(self,'ice_levelset','presence of ice if < 0, icefront position if = 0, no ice if > 0');
+                end % }}}
+                function self = setdefaultparameters(self) % {{{
+                end % }}}
                 function self = extrude(self,md) % {{{
                         self.ocean_levelset=project3d(md,'vector',self.ocean_levelset,'type','node');
@@ -50 +57 @@
                         end
                 end % }}}
-                function self = setdefaultparameters(self) % {{{
-
-                end % }}}
                 function self = oceanset(self,varargin) % {{{
                         if nargin==2,
@@ -63 +67 @@
                         else error('oceanset error message: not supported yet');
                         end
-
                 end % }}}
                 function self = iceset(self,varargin) % {{{
@@ -77 +80 @@
 
                 end % }}}
-        function md = checkconsistency(self,md,solution,analyses) % {{{
+                function md = checkconsistency(self,md,solution,analyses) % {{{
                         if strcmpi(solution,'LoveSolution'), return; end;
 
@@ -86 +89 @@
                                 warning('no ice present in the domain');
                         end
-                end % }}}
-                function disp(self) % {{{
-                        disp(sprintf('   masks:'));
-
-                        fielddisplay(self,'ocean_levelset','presence of ocean if < 0, coastline/grounding line if = 0, no ocean if > 0');
-                        fielddisplay(self,'ice_levelset','presence of ice if < 0, icefront position if = 0, no ice if > 0');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{

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

@@ -1 +1 @@
 import numpy as np
+
+from checkfield import checkfield
 from fielddisplay import fielddisplay
 from project3d import project3d
-from checkfield import checkfield
 from WriteData import WriteData
 
 
 class mask(object):
-    """
+    '''
     MASK class definition
 
-       Usage:
-          mask = mask()
-    """
-
-    def __init__(self):  # {{{
+        Usage:
+            mask = mask()
+    '''
+    def __init__(self): # {{{
         self.ice_levelset = float('NaN')
         self.ocean_levelset = float('NaN')
 
-    #set defaults
+        #set defaults
         self.setdefaultparameters()
-
-    #}}}
-    def __repr__(self):  # {{{
+    # }}}
+    def __repr__(self): # {{{
         string = "   masks:"
 
@@ -28 +27 @@
         string = "%s\n%s" % (string, fielddisplay(self, "ice_levelset", "presence of ice if < 0, icefront position if = 0, no ice if > 0"))
         return string
-    #}}}
-    def extrude(self, md):  # {{{
-        self.ice_levelset = project3d(md, 'vector', self.ice_levelset, 'type', 'node')
+    # }}}
+    def setdefaultparameters(self): # {{{
+        return self
+    # }}}
+    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 setdefaultparameters(self):  # {{{
+    # }}}
+    def mask(self, *args): # {{{
+        nargin = len(args)
+        if nargin == 0:
+            self.setdefaultparameters()
+        else:
+            raise RuntimeError("constructor not supported")
+
         return self
-    #}}}
-    def checkconsistency(self, md, solution, analyses):  # {{{
-        if(solution == 'LoveSolution'):
+    # }}}
+    def oceanset(self, *args): # {{{
+        if nargin == 2:
+            ocean = args[0]
+            index = args[1]
+            self.ocean_levelset[index] = -ocean
+        else:
+            ocean = args[0]
+            self.ocean_levelset = -ocean
+        else:
+            raise RuntimeError("oceanset error message: not supported yet")
+
+        return self
+    # }}}
+    def iceset(self, *args): # {{{
+        if nargin == 2:
+            ice = args[0]
+            index = args[1]
+            self.ice_levelset[index] = -ice
+        else:
+            ice = *args[0]
+            self.ocean_levelset = -ocean
+        else:
+            raise RuntimeError("iceset error message: not supported yet")
+
+        return self
+    # }}}
+    def checkconsistency(self, md, solution, analyses): # {{{
+        if solution == 'LoveSolution':
             return
 
@@ -48 +83 @@
         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)

issm/trunk-jpl/src/m/classes/mesh3dsurface.py ¶

@@ -224 +224 @@
                 #first line:
                 contour                 = OrderedStruct()
-                contour.x               = [self.long[el[0], self.long[el[1]]]
+                contour.x               = [self.long[el[0]], self.long[el[1]]]
                 contour.y               = [self.lat[el[0]], self.lat[el[1]]]
                 contour.Geometry        = 'Line' 
@@ -238 +238 @@
                 #second line:
                 contour                 = OrderedStruct()
-                contour.x               = [self.long[el[2], self.long[el[0]]]
+                contour.x               = [self.long[el[2]], self.long[el[0]]]
                 contour.y               = [self.lat[el[2]], self.lat[el[0]]]
                 contour.Geometry        = 'Line'