Changeset 26358 for issm/trunk-jpl/src/m/classes/SMBcomponents.m

Timestamp:

07/24/21 17:33:34 (4 years ago)

Author:

jdquinn

Message:

CHG: Completed MATLAB -> Python updates for SE; archive updates now that GMSH can be used on macOS and Linux; various minor bug fixes; formatting; cleanup

File:

• issm/trunk-jpl/src/m/classes/SMBcomponents.m (modified) (4 diffs)

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

@@ -22 +22 @@
                         end
                 end % }}}
+                function disp(self) % {{{
+                        disp(sprintf('   surface forcings parameters (SMB=accumulation-runoff-evaporation) :'));
+                        fielddisplay(self,'accumulation','accumulated snow [m/yr ice eq]');
+                        fielddisplay(self,'runoff','amount of ice melt lost from the ice column [m/yr ice eq]');
+                        fielddisplay(self,'evaporation','amount of ice lost to evaporative processes [m/yr ice eq]');
+                        fielddisplay(self, 'steps_per_step', 'number of smb steps per time step');
+                        fielddisplay(self, 'averaging', 'averaging methods from short to long steps');
+                        disp(sprintf('%51s  0: Arithmetic (default)',' '));
+                        disp(sprintf('%51s  1: Geometric',' '));
+                        disp(sprintf('%51s  2: Harmonic',' '));
+                        fielddisplay(self,'requested_outputs','additional outputs requested');
+                end % }}}
                 function self = extrude(self,md) % {{{
 
@@ -38 +50 @@
                         if isnan(self.accumulation)
                                 self.accumulation=zeros(md.mesh.numberofvertices,1);
-                                disp('  no smb.accumulation specified: values set as zero');
+                                disp('      no smb.accumulation specified: values set as zero');
                         end
                         if isnan(self.evaporation)
                                 self.evaporation=zeros(md.mesh.numberofvertices,1);
-                                disp('  no smb.evaporation specified: values set as zero');
+                                disp('      no smb.evaporation specified: values set as zero');
                         end
                         if isnan(self.runoff)
                                 self.runoff=zeros(md.mesh.numberofvertices,1);
-                                disp('  no smb.runoff specified: values set as zero');
+                                disp('      no smb.runoff specified: values set as zero');
                         end
 
@@ -66 +78 @@
                         md = checkfield(md,'fieldname','smb.requested_outputs','stringrow',1);
                 end % }}}
-                function disp(self) % {{{
-                        disp(sprintf('    surface forcings parameters (SMB=accumulation-runoff-evaporation) :'));
-                        fielddisplay(self,'accumulation','accumulated snow [m/yr ice eq]');
-                        fielddisplay(self,'runoff','amount of ice melt lost from the ice column [m/yr ice eq]');
-                        fielddisplay(self,'evaporation','amount of ice lost to evaporative processes [m/yr ice eq]');
-                        fielddisplay(self, 'steps_per_step', 'number of smb steps per time step');
-                        fielddisplay(self, 'averaging', 'averaging methods from short to long steps');
-                        disp(sprintf('%51s  0: Arithmetic (default)',' '));
-                        disp(sprintf('%51s  1: Geometric',' '));
-                        disp(sprintf('%51s  2: Harmonic',' '));
-                        fielddisplay(self,'requested_outputs','additional outputs requested');
-                end % }}}
                 function marshall(self,prefix,md,fid) % {{{
 
@@ -92 +92 @@
                         pos  = find(ismember(outputs,'default'));
                         if ~isempty(pos),
-                                outputs(pos) = [];                             %remove 'default' from outputs
+                                outputs(pos) = [];                            %remove 'default' from outputs
                                 outputs  = [outputs defaultoutputs(self,md)]; %add defaults
                         end