Changeset 27853

Timestamp:

07/26/23 01:20:28 (20 months ago)

Author:

rueckamp

Message:

CHG: Adding some options for Debris Analysis

Location:

issm/trunk-jpl/src/m

Files:

• classes/debris.m (modified) (8 diffs)
• classes/model.m (modified) (1 diff)
• solve/parseresultsfromdisk.m (modified) (1 diff)

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

@@ -12 +12 @@
                 removalmodel             = 0;
                 displacementmodel        = 0;
+                max_displacementvelocity = 0;
                 removal_slope_threshold  = 0;
                 removal_stress_threshold = 0;
@@ -66 +67 @@
                 function list = defaultoutputs(self,md) % {{{
 
-                        list = {'DebrisThickness'};
+                        list = {'DebrisThickness','DebrisMaskNodeActivation','VxDebris','VyDebris'};
 
                 end % }}}
@@ -92 +93 @@
                         self.removal_stress_threshold=0;
 
+                        %Max velocity for displacementmodel (1)
+                        self.max_displacementvelocity=0;
+
                         %default output
                         self.requested_outputs={'default'};
@@ -101 +105 @@
 
                         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);
@@ -108 +112 @@
                         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)),
@@ -120 +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: ...');
+                        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)');
@@ -135 +141 @@
                         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');
@@ -156 +163 @@
                         writejsdouble(fid,[modelname '.debris.removalmodel'],self.removalmodel);
                         writejsdouble(fid,[modelname '.debris.displacementmodel'],self.displacementmodel);
+                        writejsdouble(fid,[modelname '.debris.max_displacementvelocity'],self.displacementmodel);
                         writejsdouble(fid,[modelname '.debris.removal_slope_threshold'],self.removal_slope_threshold);
                         writejsdouble(fid,[modelname '.debris.removal_stress_threshold'],self.removal_stress_threshold);

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

@@ -1289 +1289 @@
                         if isfield(structmd,'cfl_coefficient'), md.timestepping.cfl_coefficient=structmd.cfl_coefficient; end
                         if isfield(structmd,'spcthickness'), md.masstransport.spcthickness=structmd.spcthickness; end
+                        if isfield(structmd,'spcthickness'), md.debris.spcthickness=structmd.spcthickness; end
                         if isfield(structmd,'artificial_diffusivity'), md.masstransport.stabilization=structmd.artificial_diffusivity; end
                         if isfield(structmd,'hydrostatic_adjustment'), md.masstransport.hydrostatic_adjustment=structmd.hydrostatic_adjustment; end

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

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