Changeset 27855

Timestamp:

07/26/23 08:56:26 (20 months ago)

Author:

jdquinn

Message:

CHG: MATLAB -> Python; clean up

Location:

issm/trunk-jpl/src/m

Files:

• classes/debris.m (modified) (2 diffs)
• classes/debris.py (modified) (6 diffs)
• solve/parseresultsfromdisk.m (modified) (1 diff)
• solve/parseresultsfromdisk.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/debris.m

@@ -110 +110 @@
                         md = checkfield(md,'fieldname','debris.removalmodel','values',[0 1 2]);
                         md = checkfield(md,'fieldname','debris.displacementmodel','values',[0 1 2]);
+                        md = checkfield(md,'fieldname','debris.max_displacementvelocity','>=',0);
                         md = checkfield(md,'fieldname','debris.removal_slope_threshold','>=',0);
                         md = checkfield(md,'fieldname','debris.removal_stress_threshold','>=',0);
-                        md = checkfield(md,'fieldname','debris.max_displacementvelocity','>=',0);
                         md = checkfield(md,'fieldname','debris.requested_outputs','stringrow',1);
                         if ~any(isnan(md.stressbalance.vertex_pairing)),
@@ -125 +125 @@
                         fielddisplay(self,'stabilization','0: no stabilization, 1: artificial diffusion, 2: streamline upwinding, 3: streamline upwind Petrov-Galerkin (SUPG)');
                         fielddisplay(self,'removalmodel','frontal removal of debris. 0: no removal, 1: Slope-triggered debris removal, 2: driving-stress triggered debris removal');
+                        fielddisplay(self,'displacementmodel','debris displacement. 0: no displacement, 1: additional debris velocity above the critical slope/stress threshold');
                         fielddisplay(self,'max_displacementvelocity','maximum velocity of debris transport (v_ice + v_displacement) (m/a)');
-                        fielddisplay(self,'displacementmodel','debris displacement. 0: no displacement, 1: additional debris velocity above the critical slope/stress threshold');
                         fielddisplay(self,'removal_slope_threshold','critical slope (degrees) for removalmodel (1)');
                         fielddisplay(self,'removal_stress_threshold','critical stress (Pa) for removalmodel (2)');

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

@@ -21 +21 @@
         self.removalmodel = 0
         self.displacementmodel = 0
+        self.max_displacementvelocity = 0
         self.removal_slope_threshold = 0
         self.removal_stress_threshold = 0
@@ -44 +45 @@
         s += '{}\n'.format(fielddisplay(self,'removalmodel','frontal removal of debris. 0: no removal, 1: Slope-triggered debris removal, 2: driving-stress triggered debris removal'))
         s += '{}\n'.format(fielddisplay(self,'displacementmodel','debris displacement. 0: no displacement, 1: ...'))
+        s += '{}\n'.format(fielddisplay(self,'max_displacementvelocity','maximum velocity of debris transport (v_ice + v_displacement) (m/a)'))
         s += '{}\n'.format(fielddisplay(self,'removal_slope_threshold','critical slope (degrees) for removalmodel (1)'))
         s += '{}\n'.format(fielddisplay(self,'removal_stress_threshold','critical stress (Pa) for removalmodel (2)'))
@@ -54 +56 @@
 
     def defaultoutputs(self, md):  # {{{
-        return ['DebrisThickness']
+        return ['DebrisThickness', 'DebrisMaskNodeActivation', 'VxDebris', 'VyDebris']
     # }}}
 
@@ -79 +81 @@
         self.removal_stress_threshold = 0
 
+        # Max velocity for displacementmodel (1)
+        self.max_displacementvelocity = 0
+
         # Default output
         self.requested_outputs = ['default']
@@ -90 +95 @@
 
         md = checkfield(md, 'fieldname', 'debris.spcthickness')
-        md = checkfield(md, 'fieldname', 'debris.stabilization', 'values', [0, 1, 2, 3])
+        md = checkfield(md, 'fieldname', 'debris.stabilization', 'values', [0, 1, 2, 3, 4, 5])
         md = checkfield(md, 'fieldname', 'debris.min_thickness', '>=', 0)
         md = checkfield(md, 'fieldname', 'debris.packingfraction', '>=', 0)
         md = checkfield(md, 'fieldname', 'debris.removalmodel', 'values', [0, 1, 2])
         md = checkfield(md, 'fieldname', 'debris.displacementmodel', 'values', [0, 1, 2])
+        md = checkfield(md, 'fieldname', 'debris.max_displacementvelocity', '>=', 0)
         md = checkfield(md, 'fieldname', 'debris.removal_slope_threshold', '>=', 0)
         md = checkfield(md, 'fieldname', 'debris.removal_stress_threshold', '>=', 0)
@@ -110 +116 @@
         WriteData(fid, prefix, 'object', self, 'fieldname', 'removalmodel', 'format', 'Integer')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'displacementmodel', 'format', 'Integer')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'max_displacementvelocity', 'format', 'Double')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'removal_slope_threshold', 'format', 'Double')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'removal_stress_threshold', 'format', 'Double')

issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m

@@ -242 +242 @@
                 field = field*yts;
         elseif strcmp(fieldname,'VxDebris'),
-                field = field*yts;
-        elseif strcmp(fieldname,'VyDebris'),
+                field = field*yts;
+        elseif strcmp(fieldname,'VyDebris'),
                 field = field*yts;
         elseif strcmp(fieldname,'BasalforcingsGroundediceMeltingRate'),

issm/trunk-jpl/src/m/solve/parseresultsfromdisk.py

@@ -191 +191 @@
             field = field * yts
         elif fieldname == 'VyAverage':
+            field = field * yts
+        elif fieldname == 'VxDebris':
+            field = field * yts
+        elif fieldname == 'VyDebris':
             field = field * yts
         elif fieldname == 'BasalforcingsGroundediceMeltingRate':