Changeset 27883

Timestamp:

08/22/23 12:53:37 (19 months ago)

Author:

musselman

Message:

Removed attribute 'icefront' from class stressbalance.py as it is depricated in the matlab version.

Location:

issm/trunk/src/m/classes

Files:

• love.m (modified) (1 diff)
• stressbalance.py (modified) (2 diffs)

issm/trunk/src/m/classes/love.m

@@ -41 +41 @@
                         % This function is directly called by matlab when a model object is
                         % loaded. Update old properties here
-                self.min_integration_steps      = self.int_steps_per_layers;
+
+                        if isstruct(self),
+                                oldself=self;
+                                %Assign property values from struct
+                                self=structtoobj(love(),oldself);
+                                if isfield(oldself,'int_steps_per_layers')
+                                        self.min_integration_steps      = self.int_steps_per_layers;
+                                end
+                        end
                 end% }}}
         end

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

@@ -30 +30 @@
         self.isnewton = 0
         self.FSreconditioning = 0
-        self.icefront = np.nan
+        #self.icefront = np.nan -- no longer in use
         self.maxiter = 0
         self.shelf_dampening = 0
@@ -58 +58 @@
         s += '{}\n'.format(fielddisplay(self, 'spcvy', 'y-axis velocity constraint (NaN means no constraint) [m / yr]'))
         s += '{}\n'.format(fielddisplay(self, 'spcvz', 'z-axis velocity constraint (NaN means no constraint) [m / yr]'))
-        s += '{}\n'.format(fielddisplay(self, 'icefront', 'segments on ice front list (last column 0: Air, 1: Water, 2: Ice'))
+        #s += '{}\n'.format(fielddisplay(self, 'icefront', 'segments on ice front list (last column 0: Air, 1: Water, 2: Ice'))
         s += '      MOLHO boundary conditions:\n'
         s += '{}\n'.format(fielddisplay(self, 'spcvx_base', 'x-axis basal velocity constraint (NaN means no constraint) [m / yr]'))